From 49839562ce6cc4ea2cb49c43e2390955ab0ed950 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 15 Jan 2005 20:32:23 +0000
Subject: [PATCH] Fixed a failing hunk.

---
 fuzzy.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fuzzy.diff b/fuzzy.diff
index 4644789..82ee022 100644
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -176,7 +176,7 @@ Be sure to run "make proto" before "make".
  
  	/* The receiving side mustn't obey this, or an existing symlink that
  	 * points to an identical file won't be replaced by the referent. */
---- orig/options.c	2005-01-15 04:40:15
+--- orig/options.c	2005-01-15 20:26:21
 +++ options.c	2004-11-29 01:36:48
 @@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
@@ -202,10 +202,10 @@ Be sure to run "make proto" before "make".
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -958,10 +961,10 @@ int parse_arguments(int *argc, const cha
- 			 am_server ? "server" : "client");
- 		return 0;
- #endif
+@@ -952,10 +955,10 @@ int parse_arguments(int *argc, const cha
+ 			return 0;
+ 		}
+ 		keep_partial = 0;
 -		if (dest_option) {
 +		if (dest_option || fuzzy_basis) {
  			snprintf(err_buf, sizeof err_buf,
@@ -214,7 +214,7 @@ Be sure to run "make proto" before "make".
 +				 dest_option ? dest_option : "--fuzzy");
  			return 0;
  		}
- 	} else {
+ #else
 @@ -1240,6 +1243,9 @@ void server_options(char **args,int *arg
  			args[ac++] = "--no-relative";
  	}
-- 
2.34.1