The patches for 3.0.0pre9.

[rsync/rsync-patches.git] / transliterate.diff

diff --git a/transliterate.diff b/transliterate.diff
index 7f3a6bd..92d61a7 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -89,7 +89,7 @@ diff --git a/options.c b/options.c
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
    {"8-bit-output",    '8', POPT_ARG_NONE,   &allow_8bit_chars, 0, 0, 0 },
-@@ -1631,6 +1635,31 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1632,6 +1636,31 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
                }
        }
  
@@ -121,7 +121,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -1999,6 +2028,12 @@ void server_options(char **args, int *argc_p)
+@@ -2000,6 +2029,12 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -145,7 +145,7 @@ diff --git a/rsync.yo b/rsync.yo
       --checksum-seed=NUM     set block/file checksum seed (advanced)
   -4, --ipv4                  prefer IPv4
   -6, --ipv6                  prefer IPv6
-@@ -2030,6 +2031,22 @@ specifying matching rules that can match on both sides of the transfer.
+@@ -2049,6 +2050,22 @@ specifying matching rules that can match on both sides of the transfer.
  For instance, you can specify extra include/exclude rules if there are
  filename differences on the two sides that need to be accounted for.