diff tests/test-extdiff.out @ 8065:66d0a03d3afc

extdiff: preserve execute-bit across copies (issue1562) Bug report and test by Mads Kiilerich <mads@kiilerich.com>
author Patrick Mezard <pmezard@gmail.com>
date Thu, 09 Apr 2009 14:32:44 +0200
parents e81e6c996e99
children 77324df822e2
line wrap: on
line diff
--- a/tests/test-extdiff.out	Mon Apr 13 21:21:01 2009 +0200
+++ b/tests/test-extdiff.out	Thu Apr 09 14:32:44 2009 +0200
@@ -34,3 +34,38 @@
 diffing a.8a5febb7f867/a a.34eed99112ab/a
 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a
 diff-like tools yield a non-zero exit code
+
+% test extdiff of multiple files in tmp dir:
+% diff in working directory, before
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,1 +1,1 @@
+-a
++changed
+diff --git a/b b/b
+old mode 100644
+new mode 100755
+--- a/b
++++ b/b
+@@ -1,1 +1,1 @@
+-b
++changed
+% edit with extdiff -p
+% diff in working directory, after
+diff --git a/a b/a
+--- a/a
++++ b/a
+@@ -1,1 +1,2 @@
+-a
++changed
++edited
+diff --git a/b b/b
+old mode 100644
+new mode 100755
+--- a/b
++++ b/b
+@@ -1,1 +1,2 @@
+-b
++changed
++edited