equal
deleted
inserted
replaced
1844 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
1844 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
1845 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
1845 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
1846 else: |
1846 else: |
1847 pas = [p1.ancestor(p2, warn=branchmerge)] |
1847 pas = [p1.ancestor(p2, warn=branchmerge)] |
1848 |
1848 |
1849 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1849 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2) |
1850 |
1850 |
1851 ### check phase |
1851 ### check phase |
1852 if not overwrite: |
1852 if not overwrite: |
1853 if len(pl) > 1: |
1853 if len(pl) > 1: |
1854 raise error.Abort(_("outstanding uncommitted merge")) |
1854 raise error.Abort(_("outstanding uncommitted merge")) |