Mercurial > hg
view tests/test-merge-default @ 9959:b37b060d84c7
run-tests: add a "--blacklist target" option to skip predefined test lists
Rely on a ConfigParser file, tests/blacklist, to define blacklist targets.
This allows exposing specific test suites for testing incomplete/particular
features, e.g. "run-tests.py --blacklist inotify-failures --inotify *"
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sat, 28 Nov 2009 10:25:09 +0900 |
parents | 6d36fc70754e |
children | a5576908b589 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge -P hg merge hg commit -mm2 echo % should fail because at tip hg merge hg up 0 echo % should fail because 1 head hg merge true