Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 26534:e4f27fb65da7
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 |
comparison
equal
deleted
inserted
replaced
| 26533:3e61b325e79a | 26534:e4f27fb65da7 |
|---|---|
| 995 | 995 |
| 996 if node is None: | 996 if node is None: |
| 997 nodes = list(repo.set('_updatedefaultdest()')) | 997 nodes = list(repo.set('_updatedefaultdest()')) |
| 998 if nodes: | 998 if nodes: |
| 999 node = nodes[0].node() | 999 node = nodes[0].node() |
| 1000 if p1.obsolete() and not p1.children(): | |
| 1001 pas = [p1] | |
| 1002 | 1000 |
| 1003 overwrite = force and not branchmerge | 1001 overwrite = force and not branchmerge |
| 1004 | 1002 |
| 1005 p2 = repo[node] | 1003 p2 = repo[node] |
| 1006 if pas[0] is None: | 1004 if pas[0] is None: |