Show More
@@ -488,10 +488,10 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
488 | # following table: |
|
488 | # following table: | |
489 | # |
|
489 | # | |
490 | # force branchmerge different | action |
|
490 | # force branchmerge different | action | |
491 |
# n * n | |
|
491 | # n * n | create | |
492 | # n * y | abort |
|
492 | # n * y | abort | |
493 |
# y n * | |
|
493 | # y n * | create | |
494 |
# y y n | |
|
494 | # y y n | create | |
495 | # y y y | merge |
|
495 | # y y y | merge | |
496 | # |
|
496 | # | |
497 | # Checking whether the files are different is expensive, so we |
|
497 | # Checking whether the files are different is expensive, so we | |
@@ -501,9 +501,9 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
501 | if different: |
|
501 | if different: | |
502 | aborts.append((f, "ud")) |
|
502 | aborts.append((f, "ud")) | |
503 | else: |
|
503 | else: | |
504 |
actions[f] = (' |
|
504 | actions[f] = ('c', (fl2,), "remote created") | |
505 | elif not branchmerge: |
|
505 | elif not branchmerge: | |
506 |
actions[f] = (' |
|
506 | actions[f] = ('c', (fl2,), "remote created") | |
507 | else: |
|
507 | else: | |
508 | different = _checkunknownfile(repo, wctx, p2, f) |
|
508 | different = _checkunknownfile(repo, wctx, p2, f) | |
509 | if different: |
|
509 | if different: | |
@@ -517,7 +517,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
517 | aborts.append((f, 'ud')) |
|
517 | aborts.append((f, 'ud')) | |
518 | else: |
|
518 | else: | |
519 | if acceptremote: |
|
519 | if acceptremote: | |
520 |
actions[f] = (' |
|
520 | actions[f] = ('c', (fl2,), "remote recreating") | |
521 | else: |
|
521 | else: | |
522 | actions[f] = ('dc', (fl2,), "prompt deleted/changed") |
|
522 | actions[f] = ('dc', (fl2,), "prompt deleted/changed") | |
523 |
|
523 | |||
@@ -529,6 +529,10 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
529 | raise util.Abort(_("untracked files in working directory differ " |
|
529 | raise util.Abort(_("untracked files in working directory differ " | |
530 | "from files in requested revision")) |
|
530 | "from files in requested revision")) | |
531 |
|
531 | |||
|
532 | for f, (m, args, msg) in actions.iteritems(): | |||
|
533 | if m == 'c': | |||
|
534 | actions[f] = ('g', args, msg) | |||
|
535 | ||||
532 | return actions, diverge, renamedelete |
|
536 | return actions, diverge, renamedelete | |
533 |
|
537 | |||
534 | def _resolvetrivial(repo, wctx, mctx, ancestor, actions): |
|
538 | def _resolvetrivial(repo, wctx, mctx, ancestor, actions): |
General Comments 0
You need to be logged in to leave comments.
Login now