equal
deleted
inserted
replaced
70 $ hg rebase -b dev-two -d dev-one --keepbranches |
70 $ hg rebase -b dev-two -d dev-one --keepbranches |
71 rebasing 5:24b6387c8c8c "F" |
71 rebasing 5:24b6387c8c8c "F" |
72 rebasing 6:eea13746799a "G" |
72 rebasing 6:eea13746799a "G" |
73 rebasing 7:02de42196ebe "H" |
73 rebasing 7:02de42196ebe "H" |
74 rebasing 9:cb039b7cae8e "dev-two named branch" (tip) |
74 rebasing 9:cb039b7cae8e "dev-two named branch" (tip) |
75 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-backup.hg (glob) |
75 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg (glob) |
76 |
76 |
77 $ hg tglog |
77 $ hg tglog |
78 @ 9: 'dev-two named branch' dev-two |
78 @ 9: 'dev-two named branch' dev-two |
79 | |
79 | |
80 o 8: 'H' |
80 o 8: 'H' |
99 rebasing 5:643fc9128048 "dev-one named branch" |
99 rebasing 5:643fc9128048 "dev-one named branch" |
100 rebasing 6:24de4aff8e28 "F" |
100 rebasing 6:24de4aff8e28 "F" |
101 rebasing 7:4b988a958030 "G" |
101 rebasing 7:4b988a958030 "G" |
102 rebasing 8:31d0e4ba75e6 "H" |
102 rebasing 8:31d0e4ba75e6 "H" |
103 rebasing 9:9e70cd31750f "dev-two named branch" (tip) |
103 rebasing 9:9e70cd31750f "dev-two named branch" (tip) |
104 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-backup.hg (glob) |
104 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg (glob) |
105 |
105 |
106 $ hg tglog |
106 $ hg tglog |
107 @ 9: 'dev-two named branch' dev-two |
107 @ 9: 'dev-two named branch' dev-two |
108 | |
108 | |
109 o 8: 'H' |
109 o 8: 'H' |
159 note: rebase of 5:bc8139ee757c created no changes to commit |
159 note: rebase of 5:bc8139ee757c created no changes to commit |
160 rebasing 6:42aa3cf0fa7a "F" |
160 rebasing 6:42aa3cf0fa7a "F" |
161 rebasing 7:1a1e6f72ec38 "G" |
161 rebasing 7:1a1e6f72ec38 "G" |
162 rebasing 8:904590360559 "H" |
162 rebasing 8:904590360559 "H" |
163 rebasing 9:59c2e59309fe "dev-two named branch" |
163 rebasing 9:59c2e59309fe "dev-two named branch" |
164 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-backup.hg (glob) |
164 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg (glob) |
165 |
165 |
166 $ hg tglog |
166 $ hg tglog |
167 o 9: 'dev-two named branch' dev-two |
167 o 9: 'dev-two named branch' dev-two |
168 | |
168 | |
169 o 8: 'H' |
169 o 8: 'H' |
188 rebasing 5:643fc9128048 "dev-one named branch" |
188 rebasing 5:643fc9128048 "dev-one named branch" |
189 rebasing 6:679f28760620 "F" |
189 rebasing 6:679f28760620 "F" |
190 rebasing 7:549f007a9f5f "G" |
190 rebasing 7:549f007a9f5f "G" |
191 rebasing 8:12b2bc666e20 "H" |
191 rebasing 8:12b2bc666e20 "H" |
192 rebasing 9:71325f8bc082 "dev-two named branch" (tip) |
192 rebasing 9:71325f8bc082 "dev-two named branch" (tip) |
193 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-backup.hg (glob) |
193 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg (glob) |
194 |
194 |
195 $ hg tglog |
195 $ hg tglog |
196 o 9: 'dev-two named branch' dev-two |
196 o 9: 'dev-two named branch' dev-two |
197 | |
197 | |
198 o 8: 'H' |
198 o 8: 'H' |
219 |
219 |
220 $ hg rebase -s 1 -d 9 --keepbranches |
220 $ hg rebase -s 1 -d 9 --keepbranches |
221 rebasing 1:42ccdea3bb16 "B" |
221 rebasing 1:42ccdea3bb16 "B" |
222 rebasing 2:5fddd98957c8 "C" |
222 rebasing 2:5fddd98957c8 "C" |
223 rebasing 3:32af7686d403 "D" |
223 rebasing 3:32af7686d403 "D" |
224 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
224 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
225 |
225 |
226 $ hg tglog |
226 $ hg tglog |
227 o 9: 'D' |
227 o 9: 'D' |
228 | |
228 | |
229 o 8: 'C' |
229 o 8: 'C' |
251 $ hg rebase -s 6 -d 5 |
251 $ hg rebase -s 6 -d 5 |
252 rebasing 6:3944801ae4ea "dev-two named branch" |
252 rebasing 6:3944801ae4ea "dev-two named branch" |
253 rebasing 7:3bdb949809d9 "B" |
253 rebasing 7:3bdb949809d9 "B" |
254 rebasing 8:a0d543090fa4 "C" |
254 rebasing 8:a0d543090fa4 "C" |
255 rebasing 9:e9f862ce8bad "D" (tip) |
255 rebasing 9:e9f862ce8bad "D" (tip) |
256 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-backup.hg (glob) |
256 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg (glob) |
257 |
257 |
258 $ hg tglog |
258 $ hg tglog |
259 o 9: 'D' |
259 o 9: 'D' |
260 | |
260 | |
261 o 8: 'C' |
261 o 8: 'C' |
288 rebasing 5:8e279d293175 "H" |
288 rebasing 5:8e279d293175 "H" |
289 rebasing 6:c57724c84928 "dev-two named branch" |
289 rebasing 6:c57724c84928 "dev-two named branch" |
290 rebasing 7:160b0930ccc6 "B" |
290 rebasing 7:160b0930ccc6 "B" |
291 rebasing 8:810110211f50 "C" |
291 rebasing 8:810110211f50 "C" |
292 rebasing 9:e522577ccdbd "D" |
292 rebasing 9:e522577ccdbd "D" |
293 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-backup.hg (glob) |
293 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg (glob) |
294 |
294 |
295 $ cd .. |
295 $ cd .. |
296 |
296 |
297 Rebase to other head on branch |
297 Rebase to other head on branch |
298 |
298 |
327 |
327 |
328 $ hg up -qr 2 |
328 $ hg up -qr 2 |
329 $ hg rebase |
329 $ hg rebase |
330 rebasing 2:792845bb77ee "b2" |
330 rebasing 2:792845bb77ee "b2" |
331 note: rebase of 2:792845bb77ee created no changes to commit |
331 note: rebase of 2:792845bb77ee created no changes to commit |
332 saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-backup.hg (glob) |
332 saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg (glob) |
333 $ hg tglog |
333 $ hg tglog |
334 o 2: 'c1' c |
334 o 2: 'c1' c |
335 | |
335 | |
336 | @ 1: 'b1' b |
336 | @ 1: 'b1' b |
337 |/ |
337 |/ |
342 |
342 |
343 $ cd ../case2 |
343 $ cd ../case2 |
344 $ hg up -qr 1 |
344 $ hg up -qr 1 |
345 $ hg rebase |
345 $ hg rebase |
346 rebasing 1:40039acb7ca5 "b1" |
346 rebasing 1:40039acb7ca5 "b1" |
347 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-backup.hg (glob) |
347 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg (glob) |
348 $ hg tglog |
348 $ hg tglog |
349 @ 3: 'b1' b |
349 @ 3: 'b1' b |
350 | |
350 | |
351 | o 2: 'c1' c |
351 | o 2: 'c1' c |
352 | | |
352 | | |
393 marked working directory as branch x |
393 marked working directory as branch x |
394 $ hg rebase -r 3:: -d . |
394 $ hg rebase -r 3:: -d . |
395 rebasing 3:76abc1c6f8c7 "b1" |
395 rebasing 3:76abc1c6f8c7 "b1" |
396 rebasing 4:8427af5d86f2 "c2 closed" (tip) |
396 rebasing 4:8427af5d86f2 "c2 closed" (tip) |
397 note: rebase of 4:8427af5d86f2 created no changes to commit |
397 note: rebase of 4:8427af5d86f2 created no changes to commit |
398 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-backup.hg (glob) |
398 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg (glob) |
399 $ hg tglog |
399 $ hg tglog |
400 o 3: 'b1' x |
400 o 3: 'b1' x |
401 | |
401 | |
402 | o 2: 'c1' c |
402 | o 2: 'c1' c |
403 | | |
403 | | |