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:
eab3568
)
Fixed a failing hunk.
author
Wayne Davison
<wayned@samba.org>
Wed, 14 Mar 2007 00:25:57 +0000
(
00:25
+0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 14 Mar 2007 00:25:57 +0000
(
00:25
+0000)
detect-renamed.diff
patch
|
blob
|
blame
|
history
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
278b0d0
..
0449ac9
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-34,7
+34,7
@@
TODO:
--- old/compat.c
+++ new/compat.c
--- old/compat.c
+++ new/compat.c
-@@ -4
6,6 +46
,7 @@ extern int preserve_hard_links;
+@@ -4
7,6 +47
,7 @@ extern int preserve_hard_links;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
@@
-42,13
+42,12
@@
TODO:
extern int make_backups;
extern char *backup_dir, *backup_suffix;
extern char *partial_dir;
extern int make_backups;
extern char *backup_dir, *backup_suffix;
extern char *partial_dir;
-@@ -161,7 +162,8 @@ void setup_protocol(int f_out,int f_in)
- }
+@@ -163,7 +164,7 @@ void setup_protocol(int f_out,int f_in)
} else if (protocol_version >= 30) {
} else if (protocol_version >= 30) {
- if (recurse &&
!preserve_hard_links && !delete_before
-- && !delete_after && !delay_updates && !prune_empty_dirs)
-+ && !delete_after && !delay_updates && !prune_empty_dirs
-+ && !detect_renamed)
+ if (recurse &&
allow_inc_recurse && !preserve_hard_links
+ && !delete_before && !delete_after && !delay_updates
+- && !prune_empty_dirs)
++ && !
prune_empty_dirs && !
detect_renamed)
inc_recurse = 1;
need_messages_from_generator = 1;
}
inc_recurse = 1;
need_messages_from_generator = 1;
}
@@
-513,7
+512,7
@@
TODO:
}
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
}
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
-@@ -19
09,7 +2070
,21 @@ void generate_files(int f_out, const cha
+@@ -19
11,7 +2072
,21 @@ void generate_files(int f_out, const cha
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
@@
-546,7
+545,7
@@
TODO:
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -35
1,6 +352
,7 @@ void usage(enum logcode F)
+@@ -35
2,6 +353
,7 @@ void usage(enum logcode F)
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
@@
-554,7
+553,7
@@
TODO:
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
-@@ -5
08,6 +510
,7 @@ static struct poptOption long_options[]
+@@ -5
13,6 +515
,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-562,7
+561,7
@@
TODO:
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
-@@ -1
397,7 +1400
,7 @@ int parse_arguments(int *argc, const cha
+@@ -1
402,7 +1405
,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
inplace = 1;
}
@@
-571,7
+570,7
@@
TODO:
partial_dir = tmp_partialdir;
if (inplace) {
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -14
06,6 +1409
,7 @@ int parse_arguments(int *argc, const cha
+@@ -14
11,6 +1414
,7 @@ int parse_arguments(int *argc, const cha
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",
@@
-579,7
+578,7
@@
TODO:
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -17
19,6 +1723
,8 @@ void server_options(char **args,int *arg
+@@ -17
24,6 +1728
,8 @@ void server_options(char **args,int *arg
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";