Show More
@@ -2601,7 +2601,7 b' def graft(ui, repo, *revs, **opts):' | |||||
2601 | repo.dirstate.setparents(current.node(), nullid) |
|
2601 | repo.dirstate.setparents(current.node(), nullid) | |
2602 | repo.dirstate.write() |
|
2602 | repo.dirstate.write() | |
2603 | # fix up dirstate for copies and renames |
|
2603 | # fix up dirstate for copies and renames | |
2604 |
cmdutil.duplicatecopies(repo, ctx.rev(), c |
|
2604 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) | |
2605 | # report any conflicts |
|
2605 | # report any conflicts | |
2606 | if stats and stats[3] > 0: |
|
2606 | if stats and stats[3] > 0: | |
2607 | # write out state for --continue |
|
2607 | # write out state for --continue |
General Comments 0
You need to be logged in to leave comments.
Login now