Mercurial > hg
view tests/test-alias @ 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 | 5db730475d6d |
children | a0104303f400 |
line wrap: on
line source
#!/bin/sh cat >> $HGRCPATH <<EOF [extensions] alias= [alias] myinit = init cleanstatus = status -c unknown = bargle ambiguous = s recursive = recursive EOF echo '% basic' hg myinit alias echo '% unknown' hg unknown echo '% ambiguous' hg ambiguous echo '% recursive' hg recursive cd alias echo foo > foo hg ci -Amfoo echo '% with opts' hg cleanst