Mercurial > hg
view tests/test-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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | 0ac7fee4f024 |
children | 5b7da468531b |
line wrap: on
line source
#!/bin/sh -e umask 027 mkdir test1 cd test1 hg init touch a b hg add a b hg ci -m "added a b" -d "1000000 0" cd .. hg clone test1 test3 mkdir test2 cd test2 hg init hg pull ../test1 hg co chmod +x a hg ci -m "chmod +x a" -d "1000000 0" echo % the changelog should mention file a: hg tip --template '#files#\n' cd ../test1 echo 123 >>a hg ci -m "a updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge cd ../test3 echo 123 >>b hg ci -m "b updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge ls -l ../test[123]/a > foo cut -b 1-10 < foo hg debugindex .hg/store/data/a.i hg debugindex ../test2/.hg/store/data/a.i hg debugindex ../test1/.hg/store/data/a.i