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:
a5e0f69
)
Fixed failing hunk.
author
Wayne Davison
<wayned@samba.org>
Mon, 21 Feb 2005 07:31:18 +0000
(07:31 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 21 Feb 2005 07:31:18 +0000
(07:31 +0000)
atimes.diff
patch
|
blob
|
blame
|
history
diff --git
a/atimes.diff
b/atimes.diff
index
bc345c6
..
cbb3d17
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-147,7
+147,7
@@
command before "make":
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
---- orig/options.c 2005-02-2
0 01:12:42
+--- orig/options.c 2005-02-2
1 07:28:59
+++ options.c 2005-01-24 01:51:48
@@ -50,6 +50,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
+++ options.c 2005-01-24 01:51:48
@@ -50,6 +50,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
@@
-157,7
+157,7
@@
command before "make":
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -2
79,6 +280
,7 @@ void usage(enum logcode F)
+@@ -2
84,6 +285
,7 @@ void usage(enum logcode F)
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -t, --times preserve times\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -t, --times preserve times\n");
@@
-165,7
+165,7
@@
command before "make":
rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -40
3,6 +405
,7 @@ static struct poptOption long_options[]
+@@ -40
8,6 +410
,7 @@ static struct poptOption long_options[]
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
@@
-173,7
+173,7
@@
command before "make":
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
-@@ -12
65,6 +1268
,8 @@ void server_options(char **args,int *arg
+@@ -12
72,6 +1275
,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
@@
-305,8
+305,8
@@
command before "make":
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/rsync.fns 2005-02-
13 05:50:28
-+++ testsuite/rsync.fns 2005-02-
13 06:47:50
+--- orig/testsuite/rsync.fns 2005-02-
21 07:29:00
++++ testsuite/rsync.fns 2005-02-
21 07:30:11
@@ -50,7 +50,7 @@ printmsg() {
@@ -50,7 +50,7 @@ printmsg() {
@@
-325,29
+325,14
@@
command before "make":
echo "Running: \"$1\""
eval "$1"
status=$?
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -166,16 +168,16 @@ checkit() {
- fi
-
+@@ -168,7 +170,6 @@ checkit() {
echo "-------------"
echo "-------------"
-- echo "check how the files compare with diff:"
-- echo ""
-- diff -r $diffopt "$2" "$3" || failed=YES
--
-- echo "-------------"
echo "check how the directory listings compare with diff:"
echo ""
- ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
echo "check how the directory listings compare with diff:"
echo ""
- ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
-+
-+ echo "-------------"
-+ echo "check how the files compare with diff:"
-+ echo ""
-+ diff -r $diffopt "$2" "$3" || failed=YES
-+
- if [ -z "$failed" ] ; then
- return 0
- else
+
--- orig/tls.c 2005-01-19 20:11:10
+++ tls.c 2004-07-03 20:15:41
@@ -39,6 +39,7 @@
--- orig/tls.c 2005-01-19 20:11:10
+++ tls.c 2004-07-03 20:15:41
@@ -39,6 +39,7 @@