Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: use `added` instead of `state` when moving dirstate
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 29 Sep 2021 18:37:54 +0200
changeset 48105 207df24a31f6
parent 48104 e8d6261513b9
child 48106 82e142b9ad18
dirstate-item: use `added` instead of `state` when moving dirstate Differential Revision: https://phab.mercurial-scm.org/D11542
mercurial/scmutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/scmutil.py	Wed Sep 29 18:37:20 2021 +0200
+++ b/mercurial/scmutil.py	Wed Sep 29 18:37:54 2021 +0200
@@ -1505,7 +1505,7 @@
     }
     # Adjust the dirstate copies
     for dst, src in pycompat.iteritems(copies):
-        if src not in newctx or dst in newctx or ds[dst] != b'a':
+        if src not in newctx or dst in newctx or not ds.get_entry(dst).added:
             src = None
         ds.copy(src, dst)
     repo._quick_access_changeid_invalidate()
Mercurial