Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 34787:754b5117622f
context: add workingfilectx.markcopied
With in-memory merge, copy information needs to be stored in-memory, not in the
dirstate.
To make this transition easy, move the existing dirstate-based approach to
workingfilectx; that way, other implementations can choose to store it
somewhere else.
Differential Revision: https://phab.mercurial-scm.org/D1106
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Sun, 15 Oct 2017 20:36:29 -0700 |
| parents | 9c899660700a |
| children | df2ff314e36f |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Oct 15 20:36:29 2017 -0700 +++ b/mercurial/merge.py Sun Oct 15 20:36:29 2017 -0700 @@ -2001,5 +2001,5 @@ repo.setparents(repo['.'].node(), pother) repo.dirstate.write(repo.currenttransaction()) # fix up dirstate for copies and renames - copies.duplicatecopies(repo, ctx.rev(), pctx.rev()) + copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev()) return stats