equal
deleted
inserted
replaced
1218 merge._related()). It will also not mark copies if the file wasn't modified |
1218 merge._related()). It will also not mark copies if the file wasn't modified |
1219 on the local side. This function adds the copies that were "missed" |
1219 on the local side. This function adds the copies that were "missed" |
1220 by merge.update(). |
1220 by merge.update(). |
1221 """ |
1221 """ |
1222 new_copies = pathcopies(base, ctx) |
1222 new_copies = pathcopies(base, ctx) |
1223 _filter(wctx.p1(), wctx, new_copies) |
1223 parent = wctx.p1() |
|
1224 _filter(parent, wctx, new_copies) |
|
1225 # extra filtering to drop copy information for files that existed before |
|
1226 # the graft (otherwise we would create merge filelog for non-merge commit |
|
1227 for dest, __ in list(new_copies.items()): |
|
1228 if dest in parent: |
|
1229 del new_copies[dest] |
1224 for dst, src in pycompat.iteritems(new_copies): |
1230 for dst, src in pycompat.iteritems(new_copies): |
1225 wctx[dst].markcopied(src) |
1231 wctx[dst].markcopied(src) |