Mercurial > hg
changeset 48105:207df24a31f6
dirstate-item: use `added` instead of `state` when moving dirstate
Differential Revision: https://phab.mercurial-scm.org/D11542
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 29 Sep 2021 18:37:54 +0200 |
| parents | e8d6261513b9 |
| children | 82e142b9ad18 |
| files | mercurial/scmutil.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()