From: Wayne Davison <wayned@samba.org>
Date: Tue, 9 Oct 2007 01:52:55 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/9668a39c888edb2391f80624c2fd9e87128c3e37

Fixed a failing hunk.
---

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 1518725..de09a23 100644
--- 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);
  
-@@ -2021,6 +2063,25 @@ struct file_list *send_file_list(int f, 
+@@ -2034,6 +2076,25 @@ struct file_list *send_file_list(int f, 
  	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
--		    && (file->flags & FLAG_XFER_DIR))
+-		    && (file->flags & FLAG_CONTENT_DIR))
 -			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,
@@ -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 },
-@@ -1533,7 +1536,7 @@ int parse_arguments(int *argc_p, const c
+@@ -1532,7 +1535,7 @@ int parse_arguments(int *argc_p, const c
  		inplace = 1;
  	}
  
@@ -570,7 +570,7 @@ TODO:
  		partial_dir = tmp_partialdir;
  
  	if (inplace) {
-@@ -1542,6 +1545,7 @@ int parse_arguments(int *argc_p, const c
+@@ -1541,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",
@@ -578,7 +578,7 @@ TODO:
  				 delay_updates ? "delay-updates" : "partial-dir");
  			return 0;
  		}
-@@ -1889,6 +1893,8 @@ void server_options(char **args, int *ar
+@@ -1883,6 +1887,8 @@ void server_options(char **args, int *ar
  			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
-@@ -389,6 +389,7 @@ to the detailed description below for a 
+@@ -385,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
@@ -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
-@@ -1417,6 +1418,15 @@ Note that the use of the bf(--delete) op
+@@ -1425,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.