Mercurial > hg

view tests/test-merge-symlinks.out @ 6113:8ca25589e960

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to fix test-inherit-mode on HFS+ HFS+ doesn't like setgid directories, so avoid them in most of the test and do a quick check that doesn't change the output when everything's OK.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 15 Feb 2008 10:51:35 -0200
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