tests/test-no-symlinks.hg
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 18 Mar 2008 04:07:39 -0300
changeset 6297 fed1a9c22076
parent 5089 9b5ae133bd5a
permissions -rw-r--r--
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.

(binary:application/octet-stream)