equal
deleted
inserted
replaced
1783 mfiles.difference_update(a[0] for a in acts) |
1783 mfiles.difference_update(a[0] for a in acts) |
1784 |
1784 |
1785 actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE] |
1785 actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE] |
1786 if a[0] in mfiles] |
1786 if a[0] in mfiles] |
1787 |
1787 |
1788 progress.update(None) |
1788 progress.complete() |
1789 return updateresult(updated, merged, removed, unresolved) |
1789 return updateresult(updated, merged, removed, unresolved) |
1790 |
1790 |
1791 def recordupdates(repo, actions, branchmerge): |
1791 def recordupdates(repo, actions, branchmerge): |
1792 "record merge actions to the dirstate" |
1792 "record merge actions to the dirstate" |
1793 # remove (must come first) |
1793 # remove (must come first) |