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