Mercurial > hg
view tests/test-manifest @ 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 | f11554a097c8 |
children | 7239e06e58e9 |
line wrap: on
line source
#!/bin/sh # Source bundle was generated with the following script. # # hg init # echo a > a # ln -s a l # hg ci -Ama -d'0 0' # mkdir b # echo a > b/a # chmod +x b/a # hg ci -Amb -d'1 0' hg init hg -q pull "$TESTDIR/test-manifest.hg" hg manifest hg manifest -v hg manifest --debug hg manifest -r 0 hg manifest -r 1 hg manifest -r tip echo % should fail hg manifest -r 2 hg manifest -r tip tip hg manifest tip