Updated to apply cleanly.

[rsync/rsync-patches.git] / unique-dirs.diff

diff --git a/unique-dirs.diff b/unique-dirs.diff
index 6856edf..8c6f743 100644 (file)
--- a/unique-dirs.diff
+++ b/unique-dirs.diff
@@ -6,9 +6,9 @@ back into symlinks, but the code needs to know which one is
 the real dir (if it is present in the list) because that one
 entry can't be turned into a symlink.
 
---- flist.c    12 Aug 2004 18:20:07 -0000      1.236
-+++ flist.c    31 Aug 2004 20:44:33 -0000
-@@ -724,6 +724,43 @@ void receive_file_entry(struct file_stru
+--- orig/flist.c       2004-09-21 09:40:27
++++ flist.c    2004-08-31 20:44:33
+@@ -726,6 +726,43 @@ void receive_file_entry(struct file_stru
  }
  
  
@@ -52,7 +52,7 @@ entry can't be turned into a symlink.
  /**
   * Create a file_struct for a named file by reading its stat()
   * information and performing extensive checks against global
-@@ -802,9 +839,17 @@ struct file_struct *make_file(char *fnam
+@@ -804,9 +841,17 @@ struct file_struct *make_file(char *fnam
        if (exclude_level == NO_EXCLUDES)
                goto skip_excludes;