Show More
@@ -1185,8 +1185,9 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
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" |
General Comments 0
You need to be logged in to leave comments.
Login now