equal
deleted
inserted
replaced
2091 assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0) |
2091 assert len(getfiledata) == (len(actions[ACTION_GET]) if wantfiledata else 0) |
2092 return updateresult(updated, merged, removed, unresolved), getfiledata |
2092 return updateresult(updated, merged, removed, unresolved), getfiledata |
2093 |
2093 |
2094 |
2094 |
2095 def recordupdates(repo, actions, branchmerge, getfiledata): |
2095 def recordupdates(repo, actions, branchmerge, getfiledata): |
2096 b"record merge actions to the dirstate" |
2096 """record merge actions to the dirstate""" |
2097 # remove (must come first) |
2097 # remove (must come first) |
2098 for f, args, msg in actions.get(ACTION_REMOVE, []): |
2098 for f, args, msg in actions.get(ACTION_REMOVE, []): |
2099 if branchmerge: |
2099 if branchmerge: |
2100 repo.dirstate.remove(f) |
2100 repo.dirstate.remove(f) |
2101 else: |
2101 else: |