Mercurial > hg
view tests/test-convert-datesort.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 | 49c69e1e4aa2 |
children | 4b0c9c674707 |
line wrap: on
line source
adding a marked working directory as branch brancha 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch branchb adding b 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % convert with datesort initializing destination t2 repository scanning source... sorting... converting... 8 a0 7 a1 6 a2 5 a3 4 b0 3 a4 2 a5 1 a6 0 b1 % graph converted repo o 8 "b1" | | o 7 "a6" | | | o 6 "a5" | | | o 5 "a4" | | o | 4 "b0" | | | o 3 "a3" | | | o 2 "a2" | | | o 1 "a1" |/ o 0 "a0"