view tests/test-revert-flags @ 6297:fed1a9c22076

dirstate.remove: during merges, remember the previous file state

We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').

We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.

#!/bin/sh

"$TESTDIR/hghave" execbit || exit 80

hg init repo
cd repo
echo foo > foo
chmod 644 foo
hg ci -qAm '644'

chmod 755 foo
hg ci -qAm '755'

echo '% reverting to rev 0'
hg revert -a -r 0
hg st
hg diff --git