equal
deleted
inserted
replaced
67 |
67 |
68 |
68 |
69 Branch name containing a dash (issue3181) |
69 Branch name containing a dash (issue3181) |
70 |
70 |
71 $ hg rebase -b dev-two -d dev-one --keepbranches |
71 $ hg rebase -b dev-two -d dev-one --keepbranches |
|
72 rebasing 5:24b6387c8c8c "F" |
|
73 rebasing 6:eea13746799a "G" |
|
74 rebasing 7:02de42196ebe "H" |
|
75 rebasing 9:cb039b7cae8e "dev-two named branch" (tip) |
72 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
76 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
73 |
77 |
74 $ hg tglog |
78 $ hg tglog |
75 @ 9: 'dev-two named branch' dev-two |
79 @ 9: 'dev-two named branch' dev-two |
76 | |
80 | |
91 o | 1: 'B' |
95 o | 1: 'B' |
92 |/ |
96 |/ |
93 o 0: 'A' |
97 o 0: 'A' |
94 |
98 |
95 $ hg rebase -s dev-one -d 0 --keepbranches |
99 $ hg rebase -s dev-one -d 0 --keepbranches |
|
100 rebasing 5:643fc9128048 "dev-one named branch" |
|
101 rebasing 6:24de4aff8e28 "F" |
|
102 rebasing 7:4b988a958030 "G" |
|
103 rebasing 8:31d0e4ba75e6 "H" |
|
104 rebasing 9:9e70cd31750f "dev-two named branch" (tip) |
96 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
105 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
97 |
106 |
98 $ hg tglog |
107 $ hg tglog |
99 @ 8: 'dev-two named branch' dev-two |
108 @ 8: 'dev-two named branch' dev-two |
100 | |
109 | |
141 o | 1: 'B' |
150 o | 1: 'B' |
142 |/ |
151 |/ |
143 o 0: 'A' |
152 o 0: 'A' |
144 |
153 |
145 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
154 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
|
155 rebasing 5:77854864208c "F" |
|
156 rebasing 6:63b4f9c788a1 "G" |
|
157 rebasing 7:87861e68abd3 "H" |
|
158 rebasing 8:ec00d4e0efca "dev-two named branch" |
146 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob) |
159 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob) |
147 |
160 |
148 $ hg tglog |
161 $ hg tglog |
149 o 9: 'dev-two named branch' dev-two |
162 o 9: 'dev-two named branch' dev-two |
150 | |
163 | |
165 o | 1: 'B' |
178 o | 1: 'B' |
166 |/ |
179 |/ |
167 o 0: 'A' |
180 o 0: 'A' |
168 |
181 |
169 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
182 $ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches |
|
183 rebasing 5:643fc9128048 "dev-one named branch" |
|
184 rebasing 6:05584c618d45 "F" |
|
185 rebasing 7:471695f5257d "G" |
|
186 rebasing 8:8382a539a2df "H" |
|
187 rebasing 9:11f718458b32 "dev-two named branch" (tip) |
170 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
188 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob) |
171 |
189 |
172 $ hg tglog |
190 $ hg tglog |
173 o 8: 'dev-two named branch' dev-two |
191 o 8: 'dev-two named branch' dev-two |
174 | |
192 | |
190 |
208 |
191 |
209 |
192 Rebasing descendant onto ancestor across different named branches |
210 Rebasing descendant onto ancestor across different named branches |
193 |
211 |
194 $ hg rebase -s 1 -d 8 --keepbranches |
212 $ hg rebase -s 1 -d 8 --keepbranches |
|
213 rebasing 1:42ccdea3bb16 "B" |
|
214 rebasing 2:5fddd98957c8 "C" |
|
215 rebasing 3:32af7686d403 "D" |
195 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
216 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
196 |
217 |
197 $ hg tglog |
218 $ hg tglog |
198 o 8: 'D' |
219 o 8: 'D' |
199 | |
220 | |
216 $ hg rebase -s 4 -d 5 |
237 $ hg rebase -s 4 -d 5 |
217 abort: source is ancestor of destination |
238 abort: source is ancestor of destination |
218 [255] |
239 [255] |
219 |
240 |
220 $ hg rebase -s 5 -d 4 |
241 $ hg rebase -s 5 -d 4 |
|
242 rebasing 5:32d3b0de7f37 "dev-two named branch" |
|
243 rebasing 6:580fcd9fd48f "B" |
|
244 rebasing 7:32aba0402ed2 "C" |
|
245 rebasing 8:e4787b575338 "D" (tip) |
221 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob) |
246 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob) |
222 |
247 |
223 $ hg tglog |
248 $ hg tglog |
224 o 8: 'D' |
249 o 8: 'D' |
225 | |
250 | |
246 $ hg branch -q b |
271 $ hg branch -q b |
247 $ hg ci -m 'create b' |
272 $ hg ci -m 'create b' |
248 $ hg ci -m 'close b' --close |
273 $ hg ci -m 'close b' --close |
249 $ hg rebase -b 8 -d b |
274 $ hg rebase -b 8 -d b |
250 reopening closed branch head ea9de14a36c6 |
275 reopening closed branch head ea9de14a36c6 |
|
276 rebasing 4:86693275b2ef "H" |
|
277 rebasing 5:2149726d0970 "dev-two named branch" |
|
278 rebasing 6:81e55225e95d "B" |
|
279 rebasing 7:09eda3dc3195 "C" |
|
280 rebasing 8:31298fc9d159 "D" |
251 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob) |
281 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob) |
252 |
282 |
253 $ cd .. |
283 $ cd .. |
254 |
284 |
255 Rebase to other head on branch |
285 Rebase to other head on branch |
300 rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') |
330 rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') |
301 |
331 |
302 $ cd ../case2 |
332 $ cd ../case2 |
303 $ hg up -qr 1 |
333 $ hg up -qr 1 |
304 $ hg rebase |
334 $ hg rebase |
|
335 rebasing 1:40039acb7ca5 "b1" |
305 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob) |
336 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob) |
306 $ hg tglog |
337 $ hg tglog |
307 @ 3: 'b1' b |
338 @ 3: 'b1' b |
308 | |
339 | |
309 | o 2: 'c1' c |
340 | o 2: 'c1' c |