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
# http://www.selenic.com/mercurial/bts/issue352
"$TESTDIR/hghave" eol-in-paths || exit 80
hg init foo
cd foo
A=`printf 'he\rllo'`
echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"
echo foo > "hell
o"
hg add
hg ci -A -m m
echo foo > "$A"
hg debugwalk
exit 0