Show More
@@ -796,8 +796,6 b' def duplicatecopies(repo, wctx, rev, fro' | |||||
796 | # metadata across the rebase anyway). |
|
796 | # metadata across the rebase anyway). | |
797 | exclude = pathcopies(repo[fromrev], repo[skiprev]) |
|
797 | exclude = pathcopies(repo[fromrev], repo[skiprev]) | |
798 | for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
798 | for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems(): | |
799 | # copies.pathcopies returns backward renames, so dst might not |
|
|||
800 | # actually be in the dirstate |
|
|||
801 | if dst in exclude: |
|
799 | if dst in exclude: | |
802 | continue |
|
800 | continue | |
803 | wctx[dst].markcopied(src) |
|
801 | wctx[dst].markcopied(src) |
General Comments 0
You need to be logged in to leave comments.
Login now