Mercurial > hg
view tests/test-alias.out @ 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 | 8a5d8fb59ed2 |
children | a0104303f400 |
line wrap: on
line source
% basic % unknown *** [alias] unknown: command bargle is unknown % ambiguous *** [alias] ambiguous: command s is ambiguous % recursive *** [alias] recursive: circular dependency on recursive adding foo % with opts C foo