Show More
@@ -2605,7 +2605,8 b' def graft(' | |||||
2605 | # to copy commits), and 2) informs update that the incoming changes are |
|
2605 | # to copy commits), and 2) informs update that the incoming changes are | |
2606 | # newer than the destination so it doesn't prompt about "remote changed foo |
|
2606 | # newer than the destination so it doesn't prompt about "remote changed foo | |
2607 | # which local deleted". |
|
2607 | # which local deleted". | |
2608 |
|
|
2608 | wctx = repo[None] | |
|
2609 | pctx = wctx.p1() | |||
2609 | mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node()) |
|
2610 | mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node()) | |
2610 |
|
2611 | |||
2611 | stats = update( |
|
2612 | stats = update( | |
@@ -2634,7 +2635,7 b' def graft(' | |||||
2634 | repo.setparents(pctx.node(), pother) |
|
2635 | repo.setparents(pctx.node(), pother) | |
2635 | repo.dirstate.write(repo.currenttransaction()) |
|
2636 | repo.dirstate.write(repo.currenttransaction()) | |
2636 | # fix up dirstate for copies and renames |
|
2637 | # fix up dirstate for copies and renames | |
2637 |
copies.duplicatecopies(repo, |
|
2638 | copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev()) | |
2638 | return stats |
|
2639 | return stats | |
2639 |
|
2640 | |||
2640 |
|
2641 |
General Comments 0
You need to be logged in to leave comments.
Login now