# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1444034853 25200
# Node ID e4f27fb65da7c0845b51f9e9c64025d2c7045275
# Parent  3e61b325e79af1c8b41c0e0425b17fa00be5084a
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.

diff -r 3e61b325e79a -r e4f27fb65da7 mercurial/merge.py
--- 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