Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | 35d47b06d4e3 |
children |
line wrap: on
line source
adding bar adding foo adding bomb adding a.c adding dir/a.o adding dir/b.o M dir/b.o ! a.c ! dir/a.o ? .hgignore a.c: unsupported file type (type is fifo) ! a.c # test absolute path through symlink outside repo A f # try symlink outside repo to file inside abort: ../z not under root # try cloning symlink in a subdir 1. commit a symlink ? a/b/c/demo adding a/b/c/demo 2. clone it 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # git symlink diff diff --git a/a/b/c/demo b/a/b/c/demo new file mode 120000 --- /dev/null +++ b/a/b/c/demo @@ -0,0 +1,1 @@ +/path/to/symlink/source \ No newline at end of file # import git symlink diff applying ../sl.diff diff --git a/a/b/c/demo b/a/b/c/demo new file mode 120000 --- /dev/null +++ b/a/b/c/demo @@ -0,0 +1,1 @@ +/path/to/symlink/source \ No newline at end of file