# HG changeset patch # User Pierre-Yves David # Date 1632933474 -7200 # Node ID 207df24a31f6b698a6966ef2b05787caed8b3598 # Parent e8d6261513b99ea73c12ef3da8900d79d17bf430 dirstate-item: use `added` instead of `state` when moving dirstate Differential Revision: https://phab.mercurial-scm.org/D11542 diff -r e8d6261513b9 -r 207df24a31f6 mercurial/scmutil.py --- 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()