Mercurial > hg
view tests/test-rebase-check-restore.out @ 11271:d1aca0863a9d
mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
author | Cédric Duval <cedricduval@free.fr> |
---|---|
date | Thu, 03 Jun 2010 20:40:23 +0200 |
parents | 7a9cf012dddc |
children |
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: warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Solve the conflict and go on @ 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: warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging A % - Solve the conflict and go on saved backup bundle to @ 5:F:notdefault | o 4:E: | o 3:D: | | o 2:C: | | | o 1:B: |/ o 0:A: