Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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