Got rid of patch fuzz.

[rsync/rsync-patches.git] / date-only.diff

diff --git a/date-only.diff b/date-only.diff
index b43ac3a..f2dd735 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -24,7 +24,7 @@ To use this patch, run these commands for a successful build:
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -571,6 +572,9 @@ void itemize(struct file_struct *file, i
+@@ -619,6 +620,9 @@ void itemize(const char *fnamecmp, struc
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -36,7 +36,7 @@ To use this patch, run these commands for a successful build:
  
 --- old/options.c
 +++ new/options.c
-@@ -99,6 +99,7 @@ int keep_partial = 0;
+@@ -103,6 +103,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -44,7 +44,7 @@ To use this patch, run these commands for a successful build:
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -340,6 +341,7 @@ void usage(enum logcode F)
+@@ -380,6 +381,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
@@ -52,7 +52,7 @@ To use this patch, run these commands for a successful build:
    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," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -460,6 +462,7 @@ static struct poptOption long_options[] 
+@@ -520,6 +522,7 @@ static struct poptOption long_options[] 
    {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 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,8 +60,8 @@ To use this patch, run these commands for a successful build:
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
    {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
-@@ -1692,6 +1695,9 @@ void server_options(char **args,int *arg
-                       args[ac++] = "--size-only";
+@@ -1897,6 +1900,9 @@ void server_options(char **args, int *ar
+               }
        }
  
 +      if (date_only)
@@ -72,7 +72,7 @@ To use this patch, run these commands for a successful build:
                        goto oom;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -361,6 +361,7 @@ to the detailed description below for a 
+@@ -382,6 +382,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -80,9 +80,9 @@ To use this patch, run these commands for a successful build:
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
-@@ -478,6 +479,12 @@ regardless of timestamp. This is useful 
- after using another mirroring system which may not preserve timestamps
- exactly.
+@@ -502,6 +503,12 @@ time to just looking for files that have
+ when starting to use rsync after using another mirroring system which may
+ not preserve timestamps exactly.
  
 +dit(bf(--date-only)) Normally rsync will skip any files that are
 +already the same size and have the same modification time-stamp. With the