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

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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.
Nicolas Dumazet - - Load All Authors

File last commit:

r10300:c437745f default
r22287:f3ac9677 default
Show More
README
14 lines | 516 B | text/plain | TextLexer
/ tests / blacklists / README
History | Source | Raw |Copy content |Copy permalink
Nicolas Dumazet
run-tests: split tests/blacklist in tests/blacklists/*...
 r10300 Put here definitions of blacklists for run-tests.py
Create a file per blacklist. Each file should list the names of tests that you
want to be skipped.
File names are meant to be used as targets for run-tests.py --blacklist
option.
Lines starting with # are ignored. White spaces are stripped.
e.g. if you create a blacklist/example file containing:
test-hgrc
# some comment
test-help
then calling "run-tests.py --blacklist blacklists/example" will exclude
test-hgrc and test-help from the list of tests to run.