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.
--- 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