Made the hide/protect antonym rules better.

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

diff --git a/date-only.diff b/date-only.diff
index 4d42512..d195396 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,7 +15,7 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2005-01-24 06:20:37
+--- orig/generator.c   2005-02-03 02:04:20
 +++ generator.c        2004-11-11 22:15:27
 @@ -43,6 +43,7 @@ extern int inplace;
  extern int make_backups;
@@ -34,9 +34,9 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
---- orig/options.c     2005-01-25 03:26:51
-+++ options.c  2004-11-17 19:41:59
-@@ -89,6 +89,7 @@ int keep_partial = 0;
+--- orig/options.c     2005-02-01 10:39:22
++++ options.c  2005-01-28 19:14:15
+@@ -88,6 +88,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -44,15 +44,15 @@ Jeremy Bornstein
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
-@@ -292,6 +293,7 @@ void usage(enum logcode F)
+@@ -298,6 +299,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");
-+  rprintf(F,"     --date-only             ignore size for quick check (use mod time)\n");
-   rprintf(F,"     --modify-window=NUM     compare mod times with reduced accuracy\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");
++  rprintf(F,"     --date-only             skip files that match in mod-time\n");
+   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");
-@@ -346,6 +348,7 @@ static struct poptOption long_options[] 
+@@ -352,6 +354,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 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-@@ -1221,6 +1224,9 @@ void server_options(char **args,int *arg
+@@ -1247,6 +1250,9 @@ void server_options(char **args,int *arg
        if (size_only)
                args[ac++] = "--size-only";
  
@@ -70,17 +70,17 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
---- orig/rsync.yo      2005-01-25 03:26:51
-+++ rsync.yo   2004-07-03 20:16:51
-@@ -357,6 +357,7 @@ verb(
+--- orig/rsync.yo      2005-02-01 10:39:23
++++ rsync.yo   2005-01-28 19:14:37
+@@ -349,6 +349,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
-  -I, --ignore-times          turn off mod time & file size quick check
-      --size-only             ignore mod time for quick check (use size)
-+     --date-only             ignore size for quick check (use mod time)
-      --modify-window=NUM     compare mod times with reduced accuracy
+  -I, --ignore-times          don't skip files that match size and time
+      --size-only             skip files that match in size
++     --date-only             skip files that match in mod-time
+      --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
-@@ -444,6 +445,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.