Patchwork D3984: merge: do the trivial resolution after updating sparse checkout

login
register
mail settings
Submitter phabricator
Date July 31, 2018, 1:22 p.m.
Message ID <72402282bde6a6c9e0193b1fdc3204ab@localhost.localdomain>
Download mbox | patch
Permalink /patch/32981/
State Not Applicable
Headers show

Comments

phabricator - July 31, 2018, 1:22 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd49e490a9e85: merge: do the trivial resolution after updating sparse checkout (authored by pulkit, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D3984?vs=9668&id=9675#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3984?vs=9668&id=9675

REVISION DETAIL
  https://phab.mercurial-scm.org/D3984

AFFECTED FILES
  mercurial/merge.py
  tests/test-sparse-merges.t

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-sparse-merges.t b/tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t
+++ b/tests/test-sparse-merges.t
@@ -112,5 +112,9 @@ 
   a
 
   $ hg merge
-  abort: $ENOENT$: '$TESTTMP/ytest/d'
-  [255]
+  temporarily included 1 file(s) in the sparse checkout for merging
+  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]
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1424,14 +1424,13 @@ 
                 del actions[f]
         repo.ui.note(_('end of auction\n\n'))
 
-    _resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
-
     if wctx.rev() is None:
         fractions = _forgetremoved(wctx, mctx, branchmerge)
         actions.update(fractions)
 
     prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge,
                                                 actions)
+    _resolvetrivial(repo, wctx, mctx, ancestors[0], actions)
 
     return prunedactions, diverge, renamedelete