Mercurial > hg
view tests/test-backwards-remove.t @ 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 | 5c2a4f37eace |
children | 55c6ebd11cb9 |
line wrap: on
line source
$ hg init $ echo This is file a1 > a $ hg add a $ hg commit -m "commit #0" $ ls -A .hg a $ echo This is file b1 > b $ hg add b $ hg commit -m "commit #1" $ hg co 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved B should disappear $ ls -A .hg a