Mercurial > hg

view tests/test-merge-symlinks.out @ 9959:b37b060d84c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 36794dbe66a3
children
line wrap: on
line source

3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge heads
HG_FILE l
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% merge working directory
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
HG_FILE l2
HG_MY_ISLINK 1
HG_OTHER_ISLINK 0
HG_BASE_ISLINK 0
merging l2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved