| hg-reviewers |
The current order is not obvious to the user (and I may change it in a
later patch). Lexicographical order seems like the obvious choice
here.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (4 lines) | |||
| M | tests/test-bundle-r.t (2 lines) | |||
| M | tests/test-graft.t (4 lines) | |||
| M | tests/test-issue1175.t (2 lines) | |||
| M | tests/test-rename-merge1.t (2 lines) |
| _checkcollision(repo, p2.manifest(), None) | _checkcollision(repo, p2.manifest(), None) | ||||
| else: | else: | ||||
| _checkcollision(repo, wc.manifest(), actions) | _checkcollision(repo, wc.manifest(), actions) | ||||
| # divergent renames | # divergent renames | ||||
| for f, fl in sorted(diverge.iteritems()): | for f, fl in sorted(diverge.iteritems()): | ||||
| repo.ui.warn(_("note: possible conflict - %s was renamed " | repo.ui.warn(_("note: possible conflict - %s was renamed " | ||||
| "multiple times to:\n") % f) | "multiple times to:\n") % f) | ||||
| for nf in fl: | for nf in sorted(fl): | ||||
| repo.ui.warn(" %s\n" % nf) | repo.ui.warn(" %s\n" % nf) | ||||
| # rename and delete | # rename and delete | ||||
| for f, fl in sorted(renamedelete.iteritems()): | for f, fl in sorted(renamedelete.iteritems()): | ||||
| repo.ui.warn(_("note: possible conflict - %s was deleted " | repo.ui.warn(_("note: possible conflict - %s was deleted " | ||||
| "and renamed to:\n") % f) | "and renamed to:\n") % f) | ||||
| for nf in fl: | for nf in sorted(fl): | ||||
| repo.ui.warn(" %s\n" % nf) | repo.ui.warn(" %s\n" % nf) | ||||
| ### apply phase | ### apply phase | ||||
| if not branchmerge: # just jump to the new rev | if not branchmerge: # just jump to the new rev | ||||
| fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | ||||
| if not partial and not wc.isinmemory(): | if not partial and not wc.isinmemory(): | ||||
| repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) | ||||
| # note that we're in the middle of an update | # note that we're in the middle of an update | ||||
| checking manifests | checking manifests | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| checked 5 changesets with 5 changes to 2 files | checked 5 changesets with 5 changes to 2 files | ||||
| $ cd ../test | $ cd ../test | ||||
| $ hg merge 7 | $ hg merge 7 | ||||
| note: possible conflict - afile was renamed multiple times to: | note: possible conflict - afile was renamed multiple times to: | ||||
| anotherfile | |||||
| adifferentfile | adifferentfile | ||||
| anotherfile | |||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg ci -m merge | $ hg ci -m merge | ||||
| $ cd .. | $ cd .. | ||||
| $ hg -R test bundle --base 2 test-bundle-head.hg | $ hg -R test bundle --base 2 test-bundle-head.hg | ||||
| 7 changesets found | 7 changesets found | ||||
| $ hg clone test-2 test-10 | $ hg clone test-2 test-10 | ||||
| updating to branch default | updating to branch default | ||||
| f1b: no such file in rev c9763722f9bd | f1b: no such file in rev c9763722f9bd | ||||
| [1] | [1] | ||||
| Test the cases A.0 (f4x) and A.6 (f3x) | Test the cases A.0 (f4x) and A.6 (f3x) | ||||
| $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit | $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit | ||||
| grafting 3:b69f5839d2d9 "D0" | grafting 3:b69f5839d2d9 "D0" | ||||
| note: possible conflict - f3b was renamed multiple times to: | note: possible conflict - f3b was renamed multiple times to: | ||||
| f3d | |||||
| f3a | f3a | ||||
| f3d | |||||
| warning: can't find ancestor for 'f3d' copied from 'f3b'! | warning: can't find ancestor for 'f3d' copied from 'f3b'! | ||||
| Set up the repository for some further tests | Set up the repository for some further tests | ||||
| $ hg up -q "min(desc("A0"))" | $ hg up -q "min(desc("A0"))" | ||||
| $ hg mv f1a f1e | $ hg mv f1a f1e | ||||
| $ echo c2e > f2a | $ echo c2e > f2a | ||||
| $ hg mv f3a f3e | $ hg mv f3a f3e | ||||
| merging f2a and f2c to f2c | merging f2a and f2c to f2c | ||||
| merging f5b and f5a to f5a | merging f5b and f5a to f5a | ||||
| Test the cases A.1 (f4x) and A.7 (f3x). | Test the cases A.1 (f4x) and A.7 (f3x). | ||||
| $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit | $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit | ||||
| grafting 3:b69f5839d2d9 "D0" | grafting 3:b69f5839d2d9 "D0" | ||||
| note: possible conflict - f3b was renamed multiple times to: | note: possible conflict - f3b was renamed multiple times to: | ||||
| f3e | |||||
| f3d | f3d | ||||
| f3e | |||||
| merging f4e and f4a to f4e | merging f4e and f4a to f4e | ||||
| warning: can't find ancestor for 'f3d' copied from 'f3b'! | warning: can't find ancestor for 'f3d' copied from 'f3b'! | ||||
| Check the results of the grafts tested | Check the results of the grafts tested | ||||
| $ hg log -CGv --patch --git | $ hg log -CGv --patch --git | ||||
| @ changeset: 8:93ee502e8b0a | @ changeset: 8:93ee502e8b0a | ||||
| | tag: tip | | tag: tip | ||||
| https://bz.mercurial-scm.org/1175 | https://bz.mercurial-scm.org/1175 | ||||
| $ hg init | $ hg init | ||||
| $ touch a | $ touch a | ||||
| $ hg ci -Am0 | $ hg ci -Am0 | ||||
| adding a | adding a | ||||
| $ hg mv a a1 | $ hg mv a a1 | ||||
| $ hg ci -m1 | $ hg ci -m1 | ||||
| $ hg co 0 | $ hg co 0 | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ hg mv a a2 | $ hg mv a a2 | ||||
| $ hg up | $ hg up | ||||
| note: possible conflict - a was renamed multiple times to: | note: possible conflict - a was renamed multiple times to: | ||||
| a2 | |||||
| a1 | a1 | ||||
| a2 | |||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg ci -m2 | $ hg ci -m2 | ||||
| $ touch a | $ touch a | ||||
| $ hg ci -Am3 | $ hg ci -Am3 | ||||
| adding a | adding a | ||||
| src: 'a' -> dst: 'b' * | src: 'a' -> dst: 'b' * | ||||
| src: 'a2' -> dst: 'b2' ! | src: 'a2' -> dst: 'b2' ! | ||||
| src: 'a2' -> dst: 'c2' ! | src: 'a2' -> dst: 'c2' ! | ||||
| checking for directory renames | checking for directory renames | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | ||||
| note: possible conflict - a2 was renamed multiple times to: | note: possible conflict - a2 was renamed multiple times to: | ||||
| c2 | |||||
| b2 | b2 | ||||
| c2 | |||||
| preserving a for resolve of b | preserving a for resolve of b | ||||
| removing a | removing a | ||||
| b2: remote created -> g | b2: remote created -> g | ||||
| getting b2 | getting b2 | ||||
| b: remote moved from a -> m (premerge) | b: remote moved from a -> m (premerge) | ||||
| picked tool ':merge' for b (binary False symlink False changedelete False) | picked tool ':merge' for b (binary False symlink False changedelete False) | ||||
| merging a and b to b | merging a and b to b | ||||
| my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | ||||