The patches for 3.0.3pre3.

[rsync/rsync-patches.git] / cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 0fb1fbe..d566a48 100644 (file)
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -88,7 +88,7 @@ diff --git a/exclude.c b/exclude.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -149,6 +149,7 @@
+@@ -148,6 +148,7 @@
  #define XFLG_ANCHORED2ABS     (1<<2) /* leading slash indicates absolute */
  #define XFLG_ABS_IF_SLASH     (1<<3) /* leading or interior slash is absolute */
  #define XFLG_DIR2WILD3                (1<<4) /* dir/ match gets trailing *** added */
@@ -155,9 +155,9 @@ diff --git a/testsuite/exclude.test b/testsuite/exclude.test
 +makepath "$chkdir/bar/down/to/CVS"
  rm "$chkdir"/foo/file1
  rm "$chkdir"/bar/down/to/bar/baz/*.deep
-+cp -p "$fromdir"/bar/down/to/D "$chkdir"/bar/down/to/D
-+cp -p "$fromdir"/bar/down/to/not.good "$chkdir"/bar/down/to/not.good
-+cp -p "$fromdir"/bar/down/to/CVS/Entries "$chkdir"/bar/down/to/CVS/Entries
- cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
- cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
++cp_touch "$fromdir"/bar/down/to/D "$chkdir"/bar/down/to/D
++cp_touch "$fromdir"/bar/down/to/not.good "$chkdir"/bar/down/to/not.good
++cp_touch "$fromdir"/bar/down/to/CVS/Entries "$chkdir"/bar/down/to/CVS/Entries
+ cp_touch "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
+ cp_touch "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo