Mercurial > hg
view tests/test-empty-group @ 10300:c437745f50ec
run-tests: split tests/blacklist in tests/blacklists/*
Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.
Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.
And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/
[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 10 Dec 2009 17:21:31 +0900 |
parents | 7a7d4937272b |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh # # A B # # 3 4 3 # |\/| |\ # |/\| | \ # 1 2 1 2 # \ / \ / # 0 0 # # if the result of the merge of 1 and 2 # is the same in 3 and 4, no new manifest # will be created and the manifest group # will be empty during the pull # # (plus we test a failure where outgoing # wrongly reported the number of csets) # hg init a cd a touch init hg ci -A -m 0 -d "1000000 0" touch x y hg ci -A -m 1 -d "1000000 0" hg update 0 touch x y hg ci -A -m 2 -d "1000000 0" hg merge 1 hg ci -A -m m1 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i hg update -C 1 hg merge 2 hg ci -A -m m2 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i cd .. hg clone -r 3 a b hg clone -r 4 a c hg -R a outgoing b hg -R a outgoing c hg -R b outgoing c hg -R c outgoing b hg -R b pull a hg -R c pull a