Mercurial > hg
view tests/test-symlink-basic.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 | c24f4b3f156b |
children | 3f4f14eab085 |
line wrap: on
line source
abort: file dangling not tracked! changeset: 0:cabd88b706fc tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 files: dangling description: add symlink 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling % rev 0: dangling -> nothing % rev 1: dangling -> void % modifying link dangling -> empty % reverting to rev 0: reverting dangling dangling -> nothing % backups: dangling.orig -> empty 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % copies copying dangling to dangling2 A dangling2 dangling dangling -> void dangling2 -> void % issue995 0 files updated, 0 files merged, 1 files removed, 0 files unresolved