| marmoute |
| hg-reviewers |
Previous patch may lead to confusion that the related criss-cross merge is
consistent when done from any of the parents. However this is not true and we
were missing setting an ACTION_KEEP.
This patch now exposes that bid-merge favors ACTION_KEEP always and the result
of merge is different when started from different parents.
This change also effects a test case above where bid merge was wrongly picking
r because it was missing keep related information from one of the ancestor.
| 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 (8 lines) | |||
| M | tests/test-merge-criss-cross.t (24 lines) |
| # deleting it. | # deleting it. | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, mergestatemod.ACTION_FORGET, None, b'remote deleted', | f, mergestatemod.ACTION_FORGET, None, b'remote deleted', | ||||
| ) | ) | ||||
| else: | else: | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, mergestatemod.ACTION_REMOVE, None, b'other deleted', | f, mergestatemod.ACTION_REMOVE, None, b'other deleted', | ||||
| ) | ) | ||||
| else: # file not in ancestor, not in remote | |||||
| mresult.addfile( | |||||
| f, | |||||
| mergestatemod.ACTION_KEEP, | |||||
| None, | |||||
| b'ancestor missing, remote missing', | |||||
| ) | |||||
| elif n2: # file exists only on remote side | elif n2: # file exists only on remote side | ||||
| if f in copied1: | if f in copied1: | ||||
| pass # we'll deal with it on m1 side | pass # we'll deal with it on m1 side | ||||
| elif f in branch_copies2.movewithdir: | elif f in branch_copies2.movewithdir: | ||||
| f2 = branch_copies2.movewithdir[f] | f2 = branch_copies2.movewithdir[f] | ||||
| if f2 in m1: | if f2 in m1: | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f2, | f2, | ||||
| $ hg merge 3 --debug | $ hg merge 3 --debug | ||||
| note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e | note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e | ||||
| calculating bids for ancestor 11b5b303e36c | calculating bids for ancestor 11b5b303e36c | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 | ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 | ||||
| d1/a: ancestor missing, remote missing -> k | |||||
| d1/b: ancestor missing, remote missing -> k | |||||
| d2/b: remote created -> g | d2/b: remote created -> g | ||||
| calculating bids for ancestor 154e6000f54e | calculating bids for ancestor 154e6000f54e | ||||
| unmatched files in other: | unmatched files in other: | ||||
| d2/b | d2/b | ||||
| all copies found (* = to merge, ! = divergent, % = renamed and deleted): | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||||
| on remote side: | on remote side: | ||||
| src: 'd1/b' -> dst: 'd2/b' | src: 'd1/b' -> dst: 'd2/b' | ||||
| checking for directory renames | checking for directory renames | ||||
| discovered dir src: 'd1/' -> dst: 'd2/' | discovered dir src: 'd1/' -> dst: 'd2/' | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 | ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 | ||||
| d1/a: other deleted -> r | d1/a: other deleted -> r | ||||
| d1/b: other deleted -> r | d1/b: other deleted -> r | ||||
| d2/b: remote created -> g | d2/b: remote created -> g | ||||
| auction for merging merge bids (2 ancestors) | auction for merging merge bids (2 ancestors) | ||||
| list of bids for d1/a: | list of bids for d1/a: | ||||
| ancestor missing, remote missing -> k | |||||
| other deleted -> r | other deleted -> r | ||||
| d1/a: consensus for r | d1/a: picking 'keep' action | ||||
| list of bids for d1/b: | list of bids for d1/b: | ||||
| ancestor missing, remote missing -> k | |||||
| other deleted -> r | other deleted -> r | ||||
| d1/b: consensus for r | d1/b: picking 'keep' action | ||||
| list of bids for d2/b: | list of bids for d2/b: | ||||
| remote created -> g | remote created -> g | ||||
| remote created -> g | remote created -> g | ||||
| d2/b: consensus for g | d2/b: consensus for g | ||||
| end of auction | end of auction | ||||
| d1/a: other deleted -> r | |||||
| removing d1/a | |||||
| d1/b: other deleted -> r | |||||
| removing d1/b | |||||
| d2/b: remote created -> g | d2/b: remote created -> g | ||||
| getting d2/b | getting d2/b | ||||
| 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | d1/a: ancestor missing, remote missing -> k | ||||
| d1/b: ancestor missing, remote missing -> k | |||||
| 1 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) | ||||
| Check that removal reversion does not go unotified | Check that removal reversion does not go unotified | ||||
| ================================================== | ================================================== | ||||
| On a merge, a file can be removed and user can revert that removal. This means | On a merge, a file can be removed and user can revert that removal. This means | ||||
| user has made an explicit choice of keeping the file or reverting the removal | user has made an explicit choice of keeping the file or reverting the removal | ||||
| the-file | the-file | ||||
| (merging a deletion with keeping → conflict) | (merging a deletion with keeping → conflict) | ||||
| BROKEN: this should result in conflict | BROKEN: this should result in conflict | ||||
| $ hg update --clean 'desc("merge-keeping-the-file-from-updated")' | $ hg update --clean 'desc("merge-keeping-the-file-from-updated")' | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg merge 'desc("merge-deleting-the-file-from-updated")' | $ hg merge 'desc("merge-deleting-the-file-from-updated")' | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 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) | ||||
| $ ls -1 | $ ls -1 | ||||
| other-file | other-file | ||||
| the-file | |||||
| (merging two "keeping" together → no conflict) | (merging two "keeping" together → no conflict) | ||||
| $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' | $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg merge 'desc("merge-keeping-the-file-from-updated")' | $ hg merge 'desc("merge-keeping-the-file-from-updated")' | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 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) | ||||
| $ ls -1 | $ ls -1 | ||||
| other-file | other-file | ||||
| the-file | the-file | ||||
| (merging a deletion with keeping → conflict) | (merging a deletion with keeping → conflict) | ||||
| the-file | the-file | ||||
| (merging a deletion with keeping → conflict) | (merging a deletion with keeping → conflict) | ||||
| BROKEN: this should result in conflict | BROKEN: this should result in conflict | ||||
| $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' | $ hg update --clean 'desc("merge-keeping-the-file-from-deleted")' | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg merge 'desc("merge-deleting-the-file-from-updated")' | $ hg merge 'desc("merge-deleting-the-file-from-updated")' | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 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) | ||||
| $ ls -1 | $ ls -1 | ||||
| other-file | other-file | ||||
| the-file | |||||