equal
deleted
inserted
replaced
2633 |
2633 |
2634 with repo.dirstate.parentchange(): |
2634 with repo.dirstate.parentchange(): |
2635 repo.setparents(pctx.node(), pother) |
2635 repo.setparents(pctx.node(), pother) |
2636 repo.dirstate.write(repo.currenttransaction()) |
2636 repo.dirstate.write(repo.currenttransaction()) |
2637 # fix up dirstate for copies and renames |
2637 # fix up dirstate for copies and renames |
2638 copies.graftcopies(repo, wctx, ctx, base) |
2638 copies.graftcopies(wctx, ctx, base) |
2639 return stats |
2639 return stats |
2640 |
2640 |
2641 |
2641 |
2642 def purge( |
2642 def purge( |
2643 repo, |
2643 repo, |