Updated to apply cleanly.

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

diff --git a/append.diff b/append.diff
index a5d973b..e079fb2 100644 (file)
--- a/append.diff
+++ b/append.diff
@@ -130,7 +130,7 @@ an ftp client, appending new data onto the end of the files it updates.
                        matched(f, s, buf, j, -2);
                matched(f, s, buf, len, -1);
        }
---- orig/options.c     2005-02-25 18:44:31
+--- orig/options.c     2005-03-01 05:49:24
 +++ options.c  2005-02-16 15:36:40
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
@@ -173,7 +173,7 @@ an ftp client, appending new data onto the end of the files it updates.
                                        break;
                                }
                                if (!is_wild)
-@@ -1114,6 +1120,14 @@ int parse_arguments(int *argc, const cha
+@@ -1105,6 +1111,14 @@ int parse_arguments(int *argc, const cha
                        bwlimit_writemax = 512;
        }
  
@@ -188,7 +188,7 @@ an ftp client, appending new data onto the end of the files it updates.
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  
-@@ -1413,7 +1427,9 @@ void server_options(char **args,int *arg
+@@ -1415,7 +1429,9 @@ void server_options(char **args,int *arg
        if (opt_ignore_existing && am_sender)
                args[ac++] = "--ignore-existing";
  
@@ -246,7 +246,7 @@ an ftp client, appending new data onto the end of the files it updates.
                        continue;
                }
  
---- orig/rsync.yo      2005-02-28 02:16:55
+--- orig/rsync.yo      2005-03-01 01:22:59
 +++ rsync.yo   2005-02-11 20:36:38
 @@ -309,6 +309,7 @@ to the detailed description below for a 
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)