Mercurial > hg
view tests/test-nested-repo @ 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 | c7e8fe11f34a |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg init b echo x > b/x echo '# should print nothing' hg add b hg st echo '# should fail' hg st b/x hg add b/x echo '# should fail' hg add b b/x hg st echo '# should arguably print nothing' hg st b echo a > a hg ci -Ama a echo '# should fail' hg mv a b hg st