Mercurial > hg

view tests/test-nested-repo.out @ 5503:6f26c7677463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 02 Nov 2007 14:02:28 -0700
parents c7e8fe11f34a
children
line wrap: on
line source

# should print nothing
# should fail
abort: path 'b/x' is inside repo 'b'
abort: path 'b/x' is inside repo 'b'
# should fail
abort: path 'b/x' is inside repo 'b'
# should arguably print nothing
# should fail
abort: path 'b/a' is inside repo 'b'