From: Wayne Davison <wayned@samba.org>
Date: Wed, 17 Nov 2004 19:43:26 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/bad31232ef0bda066ddcec7751cfed3b12ff24ca

Fixed a failing hunk.
---

diff --git a/date-only.diff b/date-only.diff
index 805934c..2031eee 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -34,17 +34,17 @@ Jeremy Bornstein
  	if (st->st_size != file->length)
  		return 0;
  	if (link_dest) {
---- orig/options.c	2004-11-11 22:13:09
-+++ options.c	2004-07-03 20:16:51
+--- orig/options.c	2004-11-17 19:41:31
++++ options.c	2004-11-17 19:41:59
 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
 +int date_only = 0;
+ int daemon_bwlimit = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
- int delete_after = 0;
-@@ -278,6 +279,7 @@ void usage(enum logcode F)
+@@ -279,6 +280,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          turn off mod time & file size quick check\n");
    rprintf(F,"     --size-only             ignore mod time for quick check (use size)\n");
@@ -52,7 +52,7 @@ Jeremy Bornstein
    rprintf(F,"     --modify-window=NUM     compare mod times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-@@ -326,6 +328,7 @@ static struct poptOption long_options[] 
+@@ -327,6 +329,7 @@ static struct poptOption long_options[] 
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
@@ -60,7 +60,7 @@ Jeremy Bornstein
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
    {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
-@@ -1129,6 +1132,9 @@ void server_options(char **args,int *arg
+@@ -1135,6 +1138,9 @@ void server_options(char **args,int *arg
  	if (size_only)
  		args[ac++] = "--size-only";
  
@@ -70,7 +70,7 @@ Jeremy Bornstein
  	if (modify_window_set) {
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
  			goto oom;
---- orig/rsync.yo	2004-11-11 22:13:11
+--- orig/rsync.yo	2004-11-17 19:41:31
 +++ rsync.yo	2004-07-03 20:16:51
 @@ -353,6 +353,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
@@ -80,7 +80,7 @@ Jeremy Bornstein
       --modify-window=NUM     compare mod times with reduced accuracy
   -T  --temp-dir=DIR          create temporary files in directory DIR
       --compare-dest=DIR      also compare received files relative to DIR
-@@ -427,6 +428,12 @@ regardless of timestamp. This is useful 
+@@ -434,6 +435,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps
  exactly.