Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a54a2c4
)
Fixed misplaced hunk.
author
Wayne Davison
<wayned@samba.org>
Sun, 2 Sep 2007 06:34:10 +0000
(06:34 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 2 Sep 2007 06:34:10 +0000
(06:34 +0000)
downdate.diff
patch
|
blob
|
blame
|
history
diff --git
a/downdate.diff
b/downdate.diff
index
29b5ec8
..
3484b20
100644
(file)
--- a/
downdate.diff
+++ b/
downdate.diff
@@
-17,8
+17,8
@@
To use this patch, run these commands for a successful build:
extern int ignore_existing;
extern int ignore_non_existing;
extern int inplace;
extern int ignore_existing;
extern int ignore_non_existing;
extern int inplace;
-@@ -1
437,6 +1438
,13 @@ static void recv_generator(char *fname,
-
return
;
+@@ -1
513,6 +1514
,13 @@ static void recv_generator(char *fname,
+
goto cleanup
;
}
+ if (downdate_only && statret == 0
}
+ if (downdate_only && statret == 0
@@
-31,7
+31,7
@@
To use this patch, run these commands for a successful build:
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
-@@ -1
780,6 +1788,7 @@ void generate_files(int f_out, char *loc
+@@ -1
806,6 +1814,7 @@ void check_for_finished_files(int itemiz
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
@@
-39,7
+39,7
@@
To use this patch, run these commands for a successful build:
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
-@@ -18
19,6 +1828,7 @@ void generate_files(int f_out, char *loc
+@@ -18
31,6 +1840,7 @@ void check_for_finished_files(int itemiz
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
@@
-49,23
+49,23
@@
To use this patch, run these commands for a successful build:
append_mode = -append_mode;
--- old/options.c
+++ new/options.c
append_mode = -append_mode;
--- old/options.c
+++ new/options.c
-@@ -56,6 +56,7 @@ int preserve_gid = 0;
+@@ -57,6 +57,7 @@ int preserve_uid = 0;
+ int preserve_gid = 0;
int preserve_times = 0;
int preserve_times = 0;
- int omit_dir_times = 0;
int update_only = 0;
+int downdate_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
int update_only = 0;
+int downdate_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
-@@ -
289,6 +290
,7 @@ void usage(enum logcode F)
+@@ -
317,6 +318
,7 @@ void usage(enum logcode F)
rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update skip files that are newer on the receiver\n");
+ rprintf(F," -w, --downdate skip files that are older on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," --append append data onto shorter files\n");
rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update skip files that are newer on the receiver\n");
+ rprintf(F," -w, --downdate skip files that are older on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," --append append data onto shorter files\n");
- rprintf(F,"
-d, --dirs transfer directories without recursing
\n");
-@@ -
462,6 +464
,7 @@ static struct poptOption long_options[]
+ rprintf(F,"
--append-verify like --append, but with old data in file checksum
\n");
+@@ -
517,6 +519
,7 @@ static struct poptOption long_options[]
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },