Mercurial > hg
view tests/test-non-interactive-wsgi.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 | c301f15c965a |
children | 510122bb3c7f |
line wrap: on
line source
changeset: 0:61c9426e69fe tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: test ---- HEADERS 200 Script output follows ---- DATA [('Content-Type', 'text/html; charset=ascii')] ---- ERRORS