Fix patch conflict.

diff --git a/hfs-compression.diff b/hfs-compression.diff
index 983925422f1f95e8651417c1d91d2fdc6485ae3c..a41fcd8b8ecf367cc9fb3de298293d1c2b0df8ce 100644 (file)
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -21,7 +21,7 @@ based-on: patch/master/fileflags
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1629,6 +1629,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1631,6 +1631,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
  #ifdef SUPPORT_XATTRS
                if (preserve_xattrs) {
                        sx.st.st_mode = file->mode;
@@ -255,7 +255,7 @@ diff --git a/options.c b/options.c
  int preserve_perms = 0;
  int preserve_fileflags = 0;
  int preserve_executability = 0;
-@@ -721,6 +722,10 @@ static struct poptOption long_options[] = {
+@@ -722,6 +723,10 @@ static struct poptOption long_options[] = {
    {"no-force-change",  0,  POPT_ARG_VAL,    &force_change, 0, 0, 0 },
    {"force-uchange",    0,  POPT_ARG_VAL,    &force_change, USR_IMMUTABLE, 0, 0 },
    {"force-schange",    0,  POPT_ARG_VAL,    &force_change, SYS_IMMUTABLE, 0, 0 },
@@ -266,7 +266,7 @@ diff --git a/options.c b/options.c
    {"ignore-errors",    0,  POPT_ARG_VAL,    &ignore_errors, 1, 0, 0 },
    {"no-ignore-errors", 0,  POPT_ARG_VAL,    &ignore_errors, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -1016,6 +1021,10 @@ static void set_refuse_options(void)
+@@ -1018,6 +1023,10 @@ static void set_refuse_options(void)
        parse_one_refuse_match(0, "force-uchange", list_end);
        parse_one_refuse_match(0, "force-schange", list_end);
  #endif
@@ -277,7 +277,7 @@ diff --git a/options.c b/options.c
  
        /* Now we use the descrip values to actually mark the options for refusal. */
        for (op = long_options; op != list_end; op++) {
-@@ -2070,6 +2079,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2072,6 +2081,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        }
  #endif
  
@@ -293,7 +293,7 @@ diff --git a/options.c b/options.c
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
-@@ -2628,6 +2646,11 @@ void server_options(char **args, int *argc_p)
+@@ -2630,6 +2648,11 @@ void server_options(char **args, int *argc_p)
        if (preserve_fileflags)
                args[ac++] = "--fileflags";
  
@@ -317,7 +317,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --owner, -o              preserve owner (super-user only)
  --group, -g              preserve group
  --devices                preserve device files (super-user only)
-@@ -1296,6 +1298,47 @@ your home directory (remove the '=' for that).
+@@ -1297,6 +1299,47 @@ your home directory (remove the '=' for that).
      receiving side.  It does not try to affect user flags.  This option
      overrides `--force-change` and `--force-uchange`.
  
@@ -432,13 +432,13 @@ diff --git a/rsync.h b/rsync.h
 +#define SUPPORT_HFS_COMPRESSION 1
 +#endif
 +
- #ifndef __APPLE__ /* Do we need a configure check for this? */
+ #if !defined __APPLE__ || defined HAVE_GETATTRLIST
  #define SUPPORT_ATIMES 1
  #endif
 diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
-@@ -34,6 +34,7 @@ int preserve_times = 0;
+@@ -35,6 +35,7 @@ int preserve_times = 0;
  int preserve_xattrs = 0;
  int preserve_perms = 0;
  int preserve_executability = 0;