Show More
@@ -1593,7 +1593,10 b' def forget(ui, repo, match, prefix, expl' | |||||
1593 | def duplicatecopies(repo, rev, fromrev): |
|
1593 | def duplicatecopies(repo, rev, fromrev): | |
1594 | '''reproduce copies from fromrev to rev in the dirstate''' |
|
1594 | '''reproduce copies from fromrev to rev in the dirstate''' | |
1595 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
1595 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): | |
1596 | repo.dirstate.copy(src, dst) |
|
1596 | # copies.pathcopies returns backward renames, so dst might not | |
|
1597 | # actually be in the dirstate | |||
|
1598 | if repo.dirstate[dst] in "nma": | |||
|
1599 | repo.dirstate.copy(src, dst) | |||
1597 |
|
1600 | |||
1598 | def commit(ui, repo, commitfunc, pats, opts): |
|
1601 | def commit(ui, repo, commitfunc, pats, opts): | |
1599 | '''commit the specified files or all outstanding changes''' |
|
1602 | '''commit the specified files or all outstanding changes''' |
General Comments 0
You need to be logged in to leave comments.
Login now