Show More
@@ -1220,6 +1220,12 b' def graftcopies(wctx, ctx, base):' | |||
|
1220 | 1220 | by merge.update(). |
|
1221 | 1221 | """ |
|
1222 | 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 | 1230 | for dst, src in pycompat.iteritems(new_copies): |
|
1225 | 1231 | wctx[dst].markcopied(src) |
General Comments 0
You need to be logged in to leave comments.
Login now