Updated to apply cleanly.

[rsync/rsync-patches.git] / inplace.diff

diff --git a/inplace.diff b/inplace.diff
index 7e273ea..0ba548d 100644 (file)
--- a/inplace.diff
+++ b/inplace.diff
@@ -1,7 +1,7 @@
 Patch from Mark Curtis to implement the --inplace option.
 
 --- match.c    3 Jan 2004 19:28:03 -0000       1.60
-+++ match.c    27 Apr 2004 23:26:09 -0000
++++ match.c    8 May 2004 18:38:33 -0000
 @@ -22,6 +22,7 @@
  extern int verbose;
  extern int am_server;
@@ -21,8 +21,8 @@ Patch from Mark Curtis to implement the --inplace option.
                                continue;
  
                        if (verbose > 3)
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  27 Apr 2004 23:26:10 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:38:33 -0000
 @@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -68,7 +68,7 @@ Patch from Mark Curtis to implement the --inplace option.
        if (tmpdir) {
                args[ac++] = "--temp-dir";
 --- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
-+++ receiver.c 27 Apr 2004 23:26:10 -0000
++++ receiver.c 8 May 2004 18:38:33 -0000
 @@ -45,6 +45,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
@@ -190,7 +190,7 @@ Patch from Mark Curtis to implement the --inplace option.
  
                cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
 --- rsync.c    23 Mar 2004 16:16:15 -0000      1.135
-+++ rsync.c    27 Apr 2004 23:26:11 -0000
++++ rsync.c    8 May 2004 18:38:33 -0000
 @@ -33,6 +33,7 @@ extern int preserve_uid;
  extern int preserve_gid;
  extern int preserve_perms;
@@ -211,8 +211,8 @@ Patch from Mark Curtis to implement the --inplace option.
  
        /* move tmp file over real file */
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
---- rsync.yo   27 Apr 2004 03:55:37 -0000      1.165
-+++ rsync.yo   27 Apr 2004 23:26:12 -0000
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   8 May 2004 18:38:34 -0000
 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
@@ -221,7 +221,7 @@ Patch from Mark Curtis to implement the --inplace option.
   -l, --links                 copy symlinks as symlinks
   -L, --copy-links            copy the referent of all symlinks
       --copy-unsafe-links     copy the referent of "unsafe" symlinks
-@@ -475,6 +476,17 @@ is on the objects.  In other words, if t
+@@ -477,6 +478,17 @@ is on the objects.  In other words, if t
  symlink where the destination has a file, the transfer would occur
  regardless of the timestamps.  This might change in the future (feel
  free to comment on this on the mailing list if you have an opinion).