On Thu, Jan 28, 2010 at 11:31:08AM +0100, Stefan Sperling wrote: > On Thu, Jan 28, 2010 at 10:03:45AM +0100, Daniel Näslund wrote: > > @@ -833,13 +855,17 @@ > > /* Copy HUNK_TEXT into TARGET, line by line, such that the line filter > > * and transformation callbacks set on HUNK_TEXT by the diff parsing > > * code in libsvn_diff will trigger. ABSPATH is the absolute path to the > > - * file underlying TARGET. */ > > + * file underlying TARGET. Do not copy the lines that is within FUZZ offset > > + * from the beginning or end of hunk unless NR_OF_LINES is set to 0. If > > + * NR_OF_LINES is non-zero, it represents the number of lines in > > HUNK_TEXT. */ > > static svn_error_t * > > copy_hunk_text(svn_stream_t *hunk_text, svn_stream_t *target, > > - const char *abspath, apr_pool_t *scratch_pool) > > + const char *abspath, int fuzz, int nr_of_lines, > > + apr_pool_t *scratch_pool) > > { > > Shouldn't we copy the entire hunk as we did before? > Fuzz only matters during matching, right?
Hmmm... thinking about this again, maybe it does, maybe it does not. But we don't really need to answer this question :) We should simply do whatever it is that UNIX patch(1) does. Stefan