Mercurial > hg
view tests/test-rebase-check-restore.out @ 10359:ec02cf8d1628
mq: add --mq option to some commands
This causes them to operate on the queue repository as qcommit does, and
is nicer than hg -R $(hg root)
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 23 Dec 2008 09:46:40 -0800 |
parents | b214066b7e1d |
children | 4bb4895e1693 |
line wrap: on
line source
% - Rebasing B onto E - check keep @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on rebase completed @ 7:C: | o 6:B: | | o 5:F:notdefault | | o | 4:E: | | o | 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: % - Rebase F onto E - check keepbranches @ 5:F:notdefault | | o 4:E: | | | o 3:D: |/ | o 2:C: | | | o 1:B: |/ o 0:A: merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rebase completed @ 5:F:notdefault | o 4:E: | o 3:D: | | o 2:C: | | | o 1:B: |/ o 0:A: