Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-symlinks.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 35d47b06d4e3
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
18 1. commit a symlink 18 1. commit a symlink
19 ? a/b/c/demo 19 ? a/b/c/demo
20 adding a/b/c/demo 20 adding a/b/c/demo
21 2. clone it 21 2. clone it
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 # git symlink diff
24 diff --git a/a/b/c/demo b/a/b/c/demo
25 new file mode 120000
26 --- /dev/null
27 +++ b/a/b/c/demo
28 @@ -0,0 +1,1 @@
29 +/path/to/symlink/source
30 \ No newline at end of file
31 # import git symlink diff
32 applying ../sl.diff
33 diff --git a/a/b/c/demo b/a/b/c/demo
34 new file mode 120000
35 --- /dev/null
36 +++ b/a/b/c/demo
37 @@ -0,0 +1,1 @@
38 +/path/to/symlink/source
39 \ No newline at end of file