##// END OF EJS Templates
tests: move testcase from rebase-named-branches to rebase-parameters...
Nicolas Dumazet -
r14123:7d1b6377 default
parent child Browse files
Show More
@@ -83,40 +83,3 b' Rebasing descendant onto ancestor across'
83 83 o 0: 'A'
84 84
85 85 $ cd ..
86
87 Rebasing descendant onto ancestor across the same named branches
88
89 $ hg clone -q -u . a a2
90
91 $ cd a2
92
93 $ echo I > I
94
95 $ hg ci -AmI
96 adding I
97
98 $ hg tglog
99 @ 8: 'I'
100 |
101 o 7: 'H'
102 |
103 | o 6: 'G'
104 |/|
105 o | 5: 'F'
106 | |
107 | o 4: 'E'
108 |/
109 | o 3: 'D'
110 | |
111 | o 2: 'C'
112 | |
113 | o 1: 'B'
114 |/
115 o 0: 'A'
116
117 $ hg rebase -s 8 -d 7
118 abort: source is descendant of destination
119 [255]
120
121 $ cd ..
122
@@ -50,6 +50,10 b' These fail:'
50 50 $ hg clone -q -u . a a1
51 51 $ cd a1
52 52
53 $ hg rebase -s 8 -d 7
54 abort: source is descendant of destination
55 [255]
56
53 57 $ hg rebase --continue --abort
54 58 abort: cannot use both abort and continue
55 59 [255]
General Comments 0
You need to be logged in to leave comments. Login now