view tests/test-commit-copy @ 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 dir
cd dir
echo bleh > bar
hg add bar
hg ci -m 'add bar'

hg cp bar foo
echo >> bar
hg ci -m 'cp bar foo; change bar'

hg debugrename foo
hg debugindex .hg/store/data/bar.i