Show More
| @@ -458,7 +458,7 b' def calculateupdates(repo, tctx, mctx, a' | |||||
| 458 | (force or not tctx.dirty(missing=True, branch=False))): |
|
458 | (force or not tctx.dirty(missing=True, branch=False))): | |
| 459 | _checkcollision(mctx, None) |
|
459 | _checkcollision(mctx, None) | |
| 460 | else: |
|
460 | else: | |
| 461 | _checkcollision(mctx, tctx) |
|
461 | _checkcollision(mctx, (tctx, ancestor)) | |
| 462 | if not force: |
|
462 | if not force: | |
| 463 | _checkunknown(repo, tctx, mctx) |
|
463 | _checkunknown(repo, tctx, mctx) | |
| 464 | if tctx.rev() is None: |
|
464 | if tctx.rev() is None: | |
General Comments 0
You need to be logged in to leave comments.
Login now