view tests/test-debugrename @ 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

hg init
echo a > a
hg ci -Am t

hg mv a b
hg ci -Am t1
hg debugrename b

hg mv b a
hg ci -Am t2
hg debugrename a

echo % test with --rev
hg debugrename --rev 1 b