equal
deleted
inserted
replaced
155 |/ |
155 |/ |
156 o 0: cd010b8cd998 'A' |
156 o 0: cd010b8cd998 'A' |
157 |
157 |
158 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
158 $ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches |
159 rebasing 5:bc8139ee757c "dev-one named branch" |
159 rebasing 5:bc8139ee757c "dev-one named branch" |
160 note: rebase of 5:bc8139ee757c created no changes to commit |
160 note: rebase of 5:bc8139ee757c "dev-one named branch" 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 |
165 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg |
327 rebase 'b2' to another lower branch head |
327 rebase 'b2' to another lower branch head |
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 "b2" created no changes to commit |
333 saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg |
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 |
393 $ hg branch x |
393 $ hg branch x |
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 "c2 closed" (tip) created no changes to commit |
399 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg |
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 |