Tweaked the --help text a tad.
authorWayne Davison <wayned@samba.org>
Thu, 20 Jan 2005 01:18:15 +0000 (01:18 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 20 Jan 2005 01:18:15 +0000 (01:18 +0000)
delete-during.diff

index 8c65b85..0b59fd2 100644 (file)
@@ -9,8 +9,8 @@ the old functionality (and indeed, the support for popt aliases that is now
 in CVS will let the user easily choose which method they'd like --delete to
 invoke, either personally or site-wide, without having to recompile rsync).
 
---- orig/flist.c       2005-01-19 00:24:57
-+++ flist.c    2005-01-19 00:39:09
+--- orig/flist.c       2005-01-20 00:53:48
++++ flist.c    2005-01-20 01:12:35
 @@ -45,6 +45,8 @@ extern int cvs_exclude;
  extern int recurse;
  extern int keep_dirs;
@@ -261,7 +261,7 @@ invoke, either personally or site-wide, without having to recompile rsync).
        }
  
 --- orig/options.c     2005-01-19 00:34:19
-+++ options.c  2005-01-19 01:07:34
++++ options.c  2005-01-20 01:17:04
 @@ -54,6 +54,8 @@ int dry_run = 0;
  int local_server = 0;
  int ignore_times = 0;
@@ -275,8 +275,8 @@ invoke, either personally or site-wide, without having to recompile rsync).
    rprintf(F,"     --existing              only update files that already exist\n");
    rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
    rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
-+  rprintf(F,"     --delete-before         receiver deletes before transferring, not during\n");
-+  rprintf(F,"     --delete-after          receiver deletes after transferring, not during\n");
++  rprintf(F,"     --delete-before         receiver deletes before transfer, not during\n");
++  rprintf(F,"     --delete-after          receiver deletes after transfer, not during\n");
    rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
 -  rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
@@ -462,7 +462,7 @@ invoke, either personally or site-wide, without having to recompile rsync).
   * get_tmpname() - create a tmp filename for a given filename
   *
 --- orig/rsync.yo      2005-01-17 23:11:46
-+++ rsync.yo   2005-01-19 01:05:05
++++ rsync.yo   2005-01-20 01:16:54
 @@ -341,14 +341,15 @@ verb(
       --existing              only update files that already exist
       --ignore-existing       ignore files that already exist on receiver