Changed the style of the diff headers (use "patch -p1" now).

[rsync/rsync-patches.git] / time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index b127772..467811a 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,8 +3,8 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c  2005-12-08 21:19:31
-+++ io.c       2005-05-19 09:01:27
+--- old/io.c
++++ new/io.c
 @@ -57,6 +57,7 @@ extern int remove_sent_files;
  extern int preserve_hard_links;
  extern char *filesfrom_host;
@@ -41,8 +41,8 @@ Do we need configure support for mktime()?
        if (t - last_io_in >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c     2006-01-31 03:11:30
-+++ options.c  2006-01-26 10:58:41
+--- old/options.c
++++ new/options.c
 @@ -115,6 +115,7 @@ int checksum_seed = 0;
  int inplace = 0;
  int delay_updates = 0;
@@ -131,8 +131,8 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- orig/rsync.yo      2006-01-31 03:05:44
-+++ rsync.yo   2005-02-01 10:46:35
+--- old/rsync.yo
++++ new/rsync.yo
 @@ -387,6 +387,8 @@ to the detailed description below for a 
       --password-file=FILE    read password from FILE
       --list-only             list the files instead of copying them
@@ -142,7 +142,7 @@ Do we need configure support for mktime()?
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
-@@ -1534,6 +1536,19 @@ transfer was too fast, it will wait befo
+@@ -1572,6 +1574,19 @@ transfer was too fast, it will wait befo
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
@@ -162,8 +162,8 @@ Do we need configure support for mktime()?
  dit(bf(--write-batch=FILE)) Record a file that can later be applied to
  another identical destination with bf(--read-batch). See the "BATCH MODE"
  section for details, and also the bf(--only-write-batch) option.
---- orig/util.c        2006-01-30 07:18:28
-+++ util.c     2004-07-03 20:23:22
+--- old/util.c
++++ new/util.c
 @@ -128,6 +128,132 @@ void overflow_exit(char *str)
        exit_cleanup(RERR_MALLOC);
  }