Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 26534:e4f27fb65da7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop special parent assignment in the obsolete case We can safely drop this because the very same assignment is enforcement later in the function. Dropping it will make it simpler to extract the default destination logic in its own function.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 05 Oct 2015 01:47:33 -0700
parents 5bd7c4c07f6d
children c8b332b1eb1f
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Oct 01 20:31:43 2015 -0700
+++ b/mercurial/merge.py	Mon Oct 05 01:47:33 2015 -0700
@@ -997,8 +997,6 @@
             nodes = list(repo.set('_updatedefaultdest()'))
             if nodes:
                 node = nodes[0].node()
-                if p1.obsolete() and not p1.children():
-                    pas = [p1]
 
         overwrite = force and not branchmerge