This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3984

merge: do the trivial resolution after updating sparse checkout
ClosedPublic

Authored by pulkit on Jul 27 2018, 8:38 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd49e490a9e85: merge: do the trivial resolution after updating sparse checkout
Summary

In merge, we do trivial resolution for files which were deleted on one side and
changed on other. When sparse extension in involved that file might not be
present in wdir and trivial resolution can lead to file not found error. This
patch make sure we updates the sparse checkout before doing the trivial
resolution.

This fixes the test failure demonstrated in previous patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jul 27 2018, 8:38 AM
Closed by commit rHGd49e490a9e85: merge: do the trivial resolution after updating sparse checkout (authored by pulkit). · Explain WhyJul 31 2018, 9:21 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jul 31 2018, 9:25 AM

I didn't come up with an example where d/c or c/d conflicts resolved by
_resolvetrivial() had to be fixed up by _forgetremoved().

Queued for stable, thanks.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)
Mtests/test-sparse-merges.t (8 lines)

Diff 9668

mercurial/merge.py

assert dm == ACTION_DIR_RENAME_MOVE_LOCAL, dm assert dm == ACTION_DIR_RENAME_MOVE_LOCAL, dm
if f0 in actions and actions[f0][0] == ACTION_REMOVE: if f0 in actions and actions[f0][0] == ACTION_REMOVE:
# We have one bid for removing a file and another for moving it. # We have one bid for removing a file and another for moving it.
# These two could be merged as first move and then delete ... # These two could be merged as first move and then delete ...
# but instead drop moving and just delete. # but instead drop moving and just delete.
del actions[f] del actions[f]
repo.ui.note(_('end of auction\n\n')) repo.ui.note(_('end of auction\n\n'))
_resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
if wctx.rev() is None: if wctx.rev() is None:
fractions = _forgetremoved(wctx, mctx, branchmerge) fractions = _forgetremoved(wctx, mctx, branchmerge)
actions.update(fractions) actions.update(fractions)
prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge,
actions) actions)
_resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
return prunedactions, diverge, renamedelete return prunedactions, diverge, renamedelete
def _getcwd(): def _getcwd():
try: try:
return pycompat.getcwd() return pycompat.getcwd()
except OSError as err: except OSError as err:
if err.errno == errno.ENOENT: if err.errno == errno.ENOENT:

tests/test-sparse-merges.t

| |
o 0:53f3774ed939 added .hgignore o 0:53f3774ed939 added .hgignore
$ hg debugsparse --exclude "d" $ hg debugsparse --exclude "d"
$ ls $ ls
a a
$ hg merge $ hg merge
abort: $ENOENT$: '$TESTTMP/ytest/d' temporarily included 1 file(s) in the sparse checkout for merging
[255] local [working copy] changed d which other [merge rev] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]