Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-symlinks.out @ 5408:36794dbe66a3
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 |
line wrap: on
line diff
--- a/tests/test-merge-symlinks.out +++ b/tests/test-merge-symlinks.out @@ -1,9 +1,17 @@ -% create heads -0 files updated, 0 files merged, 1 files removed, 0 files unresolved +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