Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge-symlinks.out @ 5408:36794dbe66a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test workingctx exec/link bit for copies. Also, make the test runnable on platforms without symlinks.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 15:13:50 +0200
parents 786c1206a029
children
comparison
equal deleted inserted replaced
5407:d7e7902bb190 5408:36794dbe66a3
1 % create heads 1 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3 % merge heads 2 % merge heads
3 HG_FILE l
4 HG_MY_ISLINK 1 4 HG_MY_ISLINK 1
5 HG_OTHER_ISLINK 0 5 HG_OTHER_ISLINK 0
6 HG_BASE_ISLINK 0 6 HG_BASE_ISLINK 0
7 merging l 7 merging l
8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 8 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
9 (branch merge, don't forget to commit) 9 (branch merge, don't forget to commit)
10 % merge working directory
11 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
12 HG_FILE l2
13 HG_MY_ISLINK 1
14 HG_OTHER_ISLINK 0
15 HG_BASE_ISLINK 0
16 merging l2
17 0 files updated, 1 files merged, 0 files removed, 0 files unresolved