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

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

largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.
Sean Farley - - Load All Authors

File last commit:

r21837:61b333b9 default
r22285:85bded43 default
Show More
test-context.py.out
13 lines | 192 B | text/plain | TextLexer
/ tests / test-context.py.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Fixed workingfilectx.date() (found by Thomas Waldmann) with test.
 r4110 workingfilectx.date = (1000, 0)
Martin Geisler
changelog: convert user and desc from local encoding early...
 r14379 ASCII : Gr?ezi!
Latin-1 : Gr�ezi!
UTF-8 : Grüezi!
Sean Farley
test-context: add test for memctx status
 r21836 (['foo'], [], [], [], [], [], [])
Sean Farley
test-context: add test for performing a diff on a memctx...
 r21837 diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
foo
+bar