Mercurial > hg
view tests/test-rebase-check-restore.out @ 11818:b1ae33b813cb stable
hg.clone: do not ignore branch argument when source is a repo object
This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear:
hopefully using a test to cover this usage should prevent any bugs.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Fri, 02 Jul 2010 15:12:50 +0900 |
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: