Updated to apply cleanly.

[rsync/rsync-patches.git] / remove-sent-files.diff

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index baf5df6..c400b43 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -38,7 +38,7 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
---- orig/main.c        2004-09-18 01:49:33
+--- orig/main.c        2004-09-29 17:58:26
 +++ main.c     2004-08-13 08:24:23
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -57,7 +57,7 @@ command before "make":
  
                recv_exclude_list(f_in);
                if (cvs_exclude)
-@@ -692,6 +695,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -702,6 +705,9 @@ int client_run(int f_in, int f_out, pid_
                exit_cleanup(status);
        }
  
@@ -67,7 +67,7 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-07-16 20:09:54
 @@ -87,8 +87,10 @@ int size_only = 0;
  int bwlimit = 0;
@@ -119,7 +119,7 @@ command before "make":
                case OPT_EXCLUDE:
                        add_exclude(&exclude_list, poptGetOptArg(pc), 0);
                        break;
-@@ -1095,6 +1104,9 @@ void server_options(char **args,int *arg
+@@ -1099,6 +1108,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -174,7 +174,7 @@ command before "make":
                        }
                }
        }
---- orig/rsync.h       2004-08-03 15:41:32
+--- orig/rsync.h       2004-09-22 08:47:31
 +++ rsync.h    2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
@@ -184,7 +184,7 @@ command before "make":
  
  /* update this if you make incompatible changes */
  #define PROTOCOL_VERSION 28
-@@ -126,6 +127,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -127,6 +128,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
  /* Messages types that are sent over the message channel.  The logcode
   * values must all be present here with identical numbers. */
  enum msgcode {
@@ -192,7 +192,7 @@ command before "make":
        MSG_DONE=5,     /* current phase is done */
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- orig/rsync.yo      2004-09-20 05:10:48
+--- orig/rsync.yo      2004-09-24 16:42:30
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -343,6 +343,7 @@ verb(
       --delete                delete files that don't exist on sender
@@ -202,7 +202,7 @@ command before "make":
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --partial               keep partially transferred files
-@@ -654,6 +655,11 @@ receiving side before transferring files
+@@ -661,6 +662,11 @@ receiving side before transferring files
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.