Fixed failing hunks.

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

diff --git a/inplace-protocol-bump.diff b/inplace-protocol-bump.diff
index 7d2e75b..2bdf703 100644 (file)
--- a/inplace-protocol-bump.diff
+++ b/inplace-protocol-bump.diff
@@ -3,9 +3,9 @@ sender if --inplace was specified.  This allows the sender to know when
 the transfer can fully utilize the basis file (i.e., when the basis file
 is not the destination file).
 
---- orig/generator.c   2004-11-11 22:13:09
+--- orig/generator.c   2004-11-27 17:53:24
 +++ generator.c        2004-11-03 20:37:57
-@@ -568,6 +568,8 @@ prepare_to_open:
+@@ -600,6 +600,8 @@ prepare_to_open:
  
  notify_others:
        write_int(f_out, i);
@@ -61,22 +61,22 @@ is not the destination file).
                             || s->sums[want_i].flags & SUMFLG_SAME_OFFSET)
                            && sum == s->sums[want_i].sum1
                            && memcmp(sum2, s->sums[want_i].sum2, s->s2length) == 0) {
---- orig/options.c     2004-11-11 22:13:09
-+++ options.c  2004-11-03 20:47:21
-@@ -917,10 +917,9 @@ int parse_arguments(int *argc, const cha
+--- orig/options.c     2004-11-27 17:53:24
++++ options.c  2004-11-27 18:18:27
+@@ -957,10 +957,9 @@ int parse_arguments(int *argc, const cha
                         am_server ? "server" : "client");
                return 0;
  #endif
--              if (compare_dest) {
+-              if (compare_dest || copy_dest || link_dest) {
 +              if (link_dest) {
                        snprintf(err_buf, sizeof err_buf,
 -                               "--inplace does not yet work with %s\n",
--                               link_dest ? "--link-dest" : "--compare-dest");
+-                               dest_option);
 +                               "--inplace does not yet work with --link-dest\n");
                        return 0;
                }
        } else {
---- orig/rsync.h       2004-11-03 20:30:45
+--- orig/rsync.h       2004-11-27 17:53:24
 +++ rsync.h    2004-11-03 20:32:34
 @@ -62,7 +62,7 @@
  #define FLAG_MOUNT_POINT (1<<2)       /* sender only */