Mercurial > hg
comparison mercurial/merge.py @ 22207:8dda6f6ff564
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 15 Aug 2014 11:48:05 -0500 |
| parents | b27c3beaaf30 46308fadaa15 |
| children | 6f63c47cbb86 |
comparison
equal
deleted
inserted
replaced
| 22206:6122ad50e38f | 22207:8dda6f6ff564 |
|---|---|
| 1050 if pas[0] is None: | 1050 if pas[0] is None: |
| 1051 if repo.ui.config("merge", "preferancestor") == '*': | 1051 if repo.ui.config("merge", "preferancestor") == '*': |
| 1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) | 1052 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
| 1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] | 1053 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
| 1054 else: | 1054 else: |
| 1055 pas = [p1.ancestor(p2, warn=True)] | 1055 pas = [p1.ancestor(p2, warn=branchmerge)] |
| 1056 | 1056 |
| 1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | 1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
| 1058 | 1058 |
| 1059 ### check phase | 1059 ### check phase |
| 1060 if not overwrite and len(pl) > 1: | 1060 if not overwrite and len(pl) > 1: |