Show More
@@ -496,15 +496,19 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
496 | 496 | # |
|
497 | 497 | # Checking whether the files are different is expensive, so we |
|
498 | 498 | # don't do that when we can avoid it. |
|
499 |
if |
|
|
499 | if not force: | |
|
500 | different = _checkunknownfile(repo, wctx, p2, f) | |
|
501 | if different: | |
|
502 | aborts.append((f, "ud")) | |
|
503 | else: | |
|
504 | actions[f] = ('g', (fl2,), "remote created") | |
|
505 | elif not branchmerge: | |
|
500 | 506 | actions[f] = ('g', (fl2,), "remote created") |
|
501 | 507 | else: |
|
502 | 508 | different = _checkunknownfile(repo, wctx, p2, f) |
|
503 |
if |
|
|
509 | if different: | |
|
504 | 510 | actions[f] = ('m', (f, f, None, False, pa.node()), |
|
505 | 511 | "remote differs from untracked local") |
|
506 | elif not force and different: | |
|
507 | aborts.append((f, 'ud')) | |
|
508 | 512 | else: |
|
509 | 513 | actions[f] = ('g', (fl2,), "remote created") |
|
510 | 514 | elif n2 != ma[f]: |
General Comments 0
You need to be logged in to leave comments.
Login now