diff mercurial/debugcommands.py @ 46812:e4696ba43ecd

test-copies: show some wrong ChangedFiles upgrade For file present only on one side and touched during merge, the upgrade code confused them as "merged". However they should be either "touched", or "salvaged" but they are currently recorded as "merged". See the next changesets for more details on these cases and fix. Differential Revision: https://phab.mercurial-scm.org/D10218
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 13 Mar 2021 04:54:05 +0100
parents 2b1b8f3e6510
children d4ba4d51f85f
line wrap: on
line diff