The patches for 3.1.2pre1.

[rsync-patches.git] / transliterate.diff

diff --git a/transliterate.diff b/transliterate.diff
index 0ba878eb407ebab000239aaba5c7d32e661f0731..baddd376287cfb4cb97b32ade7664048eac17f45 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 2ac35b45071c7bfd8be6be41bfd45326f1f57bce
+based-on: f8d2ecd223eedabdf3174762b64c77cb01cc403b
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
@@ -137,7 +137,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -2758,6 +2779,12 @@ void server_options(char **args, int *argc_p)
+@@ -2759,6 +2780,12 @@ void server_options(char **args, int *argc_p)
        if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
                args[ac++] = "--no-implied-dirs";
  
@@ -161,7 +161,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
-@@ -2586,6 +2587,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2588,6 +2589,22 @@ daemon uses the charset specified in its "charset" configuration parameter
  regardless of the remote charset you actually pass.  Thus, you may feel free to
  specify just the local charset for a daemon transfer (e.g. bf(--iconv=utf8)).