Show More
@@ -1229,8 +1229,11 b' def graftcopies(wctx, ctx, base):' | |||
|
1229 | 1229 | new_copies = pathcopies(base, ctx) |
|
1230 | 1230 | parent = wctx.p1() |
|
1231 | 1231 | _filter(parent, wctx, new_copies) |
|
1232 |
# |
|
|
1233 | # the graft (otherwise we would create merge filelog for non-merge commit | |
|
1232 | # Extra filtering to drop copy information for files that existed before | |
|
1233 | # the graft. This is to handle the case of grafting a rename onto a commit | |
|
1234 | # that already has the rename. Otherwise the presence of copy information | |
|
1235 | # would result in the creation of an empty commit where we would prefer to | |
|
1236 | # not create one. | |
|
1234 | 1237 | for dest, __ in list(new_copies.items()): |
|
1235 | 1238 | if dest in parent: |
|
1236 | 1239 | del new_copies[dest] |
General Comments 0
You need to be logged in to leave comments.
Login now