equal
deleted
inserted
replaced
1339 pas = [p1.ancestor(p2, warn=branchmerge)] |
1339 pas = [p1.ancestor(p2, warn=branchmerge)] |
1340 |
1340 |
1341 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1341 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
1342 |
1342 |
1343 ### check phase |
1343 ### check phase |
1344 if not overwrite and len(pl) > 1: |
1344 if not overwrite: |
1345 raise error.Abort(_("outstanding uncommitted merge")) |
1345 if len(pl) > 1: |
|
1346 raise error.Abort(_("outstanding uncommitted merge")) |
|
1347 ms = mergestate.read(repo) |
|
1348 if list(ms.unresolved()): |
|
1349 raise error.Abort(_("outstanding merge conflicts")) |
1346 if branchmerge: |
1350 if branchmerge: |
1347 if pas == [p2]: |
1351 if pas == [p2]: |
1348 raise error.Abort(_("merging with a working directory ancestor" |
1352 raise error.Abort(_("merging with a working directory ancestor" |
1349 " has no effect")) |
1353 " has no effect")) |
1350 elif pas == [p1]: |
1354 elif pas == [p1]: |