##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dirstate.remove: during merges, remember the previous file state...
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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r6297:fed1a9c2 default
r6297:fed1a9c2 default
Show More
test-merge-remove.out
15 lines | 307 B | text/plain | TextLexer
/ tests / test-merge-remove.out
History | Annotation | Raw |Copy content |Copy permalink
merging foo1 and foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r 0 -2 bar
r 0 -1 foo1
copy: foo -> foo1
R bar
R foo1
foo