Updated to apply cleanly.

[rsync/rsync-patches.git] / compare-dest.diff

diff --git a/compare-dest.diff b/compare-dest.diff
index cdb9356..d2c3777 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -82,7 +82,7 @@ Before compiling, be sure to run "make proto".
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-08-13 07:55:37
 @@ -114,12 +114,13 @@ int write_batch = 0;
  int read_batch = 0;
@@ -198,7 +198,7 @@ Before compiling, be sure to run "make proto".
                                goto options_rejected;
                }
                if (backup_dir) {
-@@ -890,8 +916,8 @@ int parse_arguments(int *argc, const cha
+@@ -894,8 +920,8 @@ int parse_arguments(int *argc, const cha
   **/
  void server_options(char **args,int *argc)
  {
@@ -208,7 +208,7 @@ Before compiling, be sure to run "make proto".
        char *arg;
  
        int i, x;
-@@ -1074,13 +1100,16 @@ void server_options(char **args,int *arg
+@@ -1078,13 +1104,16 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }