##// END OF EJS Templates
rebase: add test to show --stop moves bookmarks...
Sushil khanchi -
r39131:33f5cffe default
parent child Browse files
Show More
@@ -2022,3 +2022,79 b' Test --stop raise errors with conflictin'
2022 2022 $ hg rebase --stop --continue
2023 2023 abort: cannot use --stop with --abort or --continue
2024 2024 [255]
2025
2026 Test --stop moves bookmarks of original revisions to new rebased nodes:
2027 ======================================================================
2028 $ cd ..
2029 $ hg init repo
2030 $ cd repo
2031
2032 $ echo a > a
2033 $ hg ci -Am A
2034 adding a
2035
2036 $ echo b > b
2037 $ hg ci -Am B
2038 adding b
2039 $ hg book X
2040 $ hg book Y
2041
2042 $ echo c > c
2043 $ hg ci -Am C
2044 adding c
2045 $ hg book Z
2046
2047 $ echo d > d
2048 $ hg ci -Am D
2049 adding d
2050
2051 $ hg up 0 -q
2052 $ echo e > e
2053 $ hg ci -Am E
2054 adding e
2055 created new head
2056
2057 $ echo doubt > d
2058 $ hg ci -Am "conflict with d"
2059 adding d
2060
2061 $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
2062 @ 5: 39adf30bc1be 'conflict with d' bookmarks:
2063 |
2064 o 4: 9c1e55f411b6 'E' bookmarks:
2065 |
2066 | o 3: 67a385d4e6f2 'D' bookmarks: Z
2067 | |
2068 | o 2: 49cb3485fa0c 'C' bookmarks: Y
2069 | |
2070 | o 1: 6c81ed0049f8 'B' bookmarks: X
2071 |/
2072 o 0: 1994f17a630e 'A' bookmarks:
2073
2074 $ hg rebase -s 1 -d 5
2075 rebasing 1:6c81ed0049f8 "B" (X)
2076 rebasing 2:49cb3485fa0c "C" (Y)
2077 rebasing 3:67a385d4e6f2 "D" (Z)
2078 merging d
2079 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
2080 unresolved conflicts (see hg resolve, then hg rebase --continue)
2081 [1]
2082 $ hg rebase --stop
2083 1 new orphan changesets
2084 $ hg log -GT "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
2085 o 7: 9c86c650b686 'C' bookmarks: Y
2086 |
2087 o 6: 9b87b54e5fd8 'B' bookmarks: X
2088 |
2089 @ 5: 39adf30bc1be 'conflict with d' bookmarks:
2090 |
2091 o 4: 9c1e55f411b6 'E' bookmarks:
2092 |
2093 | * 3: 67a385d4e6f2 'D' bookmarks: Z
2094 | |
2095 | x 2: 49cb3485fa0c 'C' bookmarks:
2096 | |
2097 | x 1: 6c81ed0049f8 'B' bookmarks:
2098 |/
2099 o 0: 1994f17a630e 'A' bookmarks:
2100
General Comments 0
You need to be logged in to leave comments. Login now