1183 return actions, diverge, renamedelete |
1183 return actions, diverge, renamedelete |
1184 |
1184 |
1185 def _resolvetrivial(repo, wctx, mctx, ancestor, actions): |
1185 def _resolvetrivial(repo, wctx, mctx, ancestor, actions): |
1186 """Resolves false conflicts where the nodeid changed but the content |
1186 """Resolves false conflicts where the nodeid changed but the content |
1187 remained the same.""" |
1187 remained the same.""" |
1188 |
1188 # We force a copy of actions.items() because we're going to mutate |
1189 for f, (m, args, msg) in actions.items(): |
1189 # actions as we resolve trivial conflicts. |
|
1190 for f, (m, args, msg) in list(actions.items()): |
1190 if m == 'cd' and f in ancestor and not wctx[f].cmp(ancestor[f]): |
1191 if m == 'cd' and f in ancestor and not wctx[f].cmp(ancestor[f]): |
1191 # local did change but ended up with same content |
1192 # local did change but ended up with same content |
1192 actions[f] = 'r', None, "prompt same" |
1193 actions[f] = 'r', None, "prompt same" |
1193 elif m == 'dc' and f in ancestor and not mctx[f].cmp(ancestor[f]): |
1194 elif m == 'dc' and f in ancestor and not mctx[f].cmp(ancestor[f]): |
1194 # remote did change but ended up with same content |
1195 # remote did change but ended up with same content |