view tests/test-extra-filelog-entry @ 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
#
# test for issue351

# Environement setup for MQ
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

#Repo init
hg init
hg qinit

echo b > b
hg ci -A -m foo
echo cc > b
hg qnew -f foo.diff
echo b > b
hg qrefresh
hg debugindex .hg/store/data/b.i