Show More
@@ -458,10 +458,13 b' class mergestate(object):' | |||
|
458 | 458 | if complete: |
|
459 | 459 | action = None |
|
460 | 460 | if deleted: |
|
461 |
if |
|
|
461 | if fcd.isabsent(): | |
|
462 | # dc: local picked. Need to drop if present, which may | |
|
463 | # happen on re-resolves. | |
|
464 | action = 'f' | |
|
465 | else: | |
|
462 | 466 | # cd: remote picked (or otherwise deleted) |
|
463 | 467 | action = 'r' |
|
464 | # else: dc: local picked (no action necessary) | |
|
465 | 468 | else: |
|
466 | 469 | if fcd.isabsent(): # dc: remote picked |
|
467 | 470 | action = 'g' |
@@ -511,7 +514,7 b' class mergestate(object):' | |||
|
511 | 514 | |
|
512 | 515 | def actions(self): |
|
513 | 516 | """return lists of actions to perform on the dirstate""" |
|
514 | actions = {'r': [], 'a': [], 'g': []} | |
|
517 | actions = {'r': [], 'f': [], 'a': [], 'g': []} | |
|
515 | 518 | for f, (r, action) in self._results.iteritems(): |
|
516 | 519 | if action is not None: |
|
517 | 520 | actions[action].append((f, None, "merge result")) |
General Comments 0
You need to be logged in to leave comments.
Login now