Mercurial > hg

view tests/test-hup.out @ 6297:fed1a9c22076

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dd5a501cb97f
children a685011ed38e
line wrap: on
line source

0
0
adding changesets
transaction abort!
rollback completed
killed!
.hg/00changelog.i .hg/journal.branch .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a