Mercurial > hg
view tests/test-symlinks.out @ 6179:36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 28 Feb 2008 00:07:37 +0100 |
parents | 35d47b06d4e3 |
children | 0750f11152fe |
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