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:
f264662
)
Fixed a failing hunk.
author
Wayne Davison
<wayned@samba.org>
Tue, 9 Oct 2007 01:52:55 +0000
(
01:52
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 9 Oct 2007 01:52:55 +0000
(
01:52
+0000)
detect-renamed.diff
patch
|
blob
|
blame
|
history
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
1518725
..
de09a23
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-116,7
+116,7
@@
TODO:
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -20
21,6 +2063
,25 @@ struct file_list *send_file_list(int f,
+@@ -20
34,6 +2076
,25 @@ struct file_list *send_file_list(int f,
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
@@
-454,9
+454,9
@@
TODO:
}
}
else if (delete_during && f_out != -1 && !phase && dry_run < 2
}
}
else if (delete_during && f_out != -1 && !phase && dry_run < 2
-- && (file->flags & FLAG_
XFER
_DIR))
+- && (file->flags & FLAG_
CONTENT
_DIR))
- delete_in_dir(fname, file, &real_sx.st.st_dev);
- delete_in_dir(fname, file, &real_sx.st.st_dev);
-+ && (file->flags & FLAG_
XFER
_DIR)) {
++ && (file->flags & FLAG_
CONTENT
_DIR)) {
+ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
+ delete_in_dir(fname, file, &real_sx.st.st_dev,
+ if (detect_renamed && real_ret != 0)
+ unexplored_dirs++;
+ delete_in_dir(fname, file, &real_sx.st.st_dev,
@@
-561,7
+561,7
@@
TODO:
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
-@@ -153
3,7 +1536
,7 @@ int parse_arguments(int *argc_p, const c
+@@ -153
2,7 +1535
,7 @@ int parse_arguments(int *argc_p, const c
inplace = 1;
}
inplace = 1;
}
@@
-570,7
+570,7
@@
TODO:
partial_dir = tmp_partialdir;
if (inplace) {
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -154
2,6 +1545
,7 @@ int parse_arguments(int *argc_p, const c
+@@ -154
1,6 +1544
,7 @@ int parse_arguments(int *argc_p, const c
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
@@
-578,7
+578,7
@@
TODO:
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -188
9,6 +1893
,8 @@ void server_options(char **args, int *ar
+@@ -188
3,6 +1887
,8 @@ void server_options(char **args, int *ar
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
@@
-589,7
+589,7
@@
TODO:
if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
--- old/rsync.yo
+++ new/rsync.yo
if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
--- old/rsync.yo
+++ new/rsync.yo
-@@ -38
9,6 +389
,7 @@ to the detailed description below for a
+@@ -38
5,6 +385
,7 @@ to the detailed description below for a
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
@@
-597,7
+597,7
@@
TODO:
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -14
17,6 +1418
,15 @@ Note that the use of the bf(--delete) op
+@@ -14
25,6 +1426
,15 @@ Note that the use of the bf(--delete) op
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.