view tests/test-symlinks.out @ 8810:ac92775b3b80

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.
author Patrick Mezard <pmezard@gmail.com>
date Mon, 15 Jun 2009 00:03:26 +0200
parents 0750f11152fe
children a3d73b3e1f8a
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
updating working directory
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