[PATCH] Fix issue 3686 - executable flag is not maintained during a merge

2011-01-30 Thread Daniel Becroft
Hi, Attached is a (work-in-progress) patch to fix issue 3686[1]. For those unfamiliar with the issue: when a binary file (with svn:executable set) is modified as a result of a merge, the executable flag is missing post-merge. A commit will restore the flag. I've looked into the code, and have fo

Re: diff4-optimization-bytes

2011-01-30 Thread Johan Corveleyn
On Fri, Jan 28, 2011 at 7:58 PM, Daniel Shahaf wrote: > Johan Corveleyn wrote on Fri, Jan 28, 2011 at 14:04:07 +0100: >> On Fri, Jan 28, 2011 at 9:29 AM, Daniel Shahaf >> wrote: >> > May I suggest that, if this code is to be released, then you validate >> > its correctnss?  For example, a minima

Re: svn commit: r1065170 - in /subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff : diff_file.c lcs.c

2011-01-30 Thread Daniel Shahaf
Johan Corveleyn wrote on Sun, Jan 30, 2011 at 15:32:00 +0100: > On Sun, Jan 30, 2011 at 4:17 AM, wrote: > > @@ -377,7 +381,6 @@ find_identical_prefix(svn_boolean_t *rea > > -  apr_ssize_t max_delta, delta; ... > > @@ -503,7 +506,7 @@ find_identical_suffix(struct file_info f > > -  svn_boolean_t i

Re: svn commit: r1065170 - in /subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff: diff_file.c lcs.c

2011-01-30 Thread Johan Corveleyn
Hi Daniel, Thanks for taking a look. However ... On Sun, Jan 30, 2011 at 4:17 AM, wrote: > Author: danielsh > Date: Sun Jan 30 03:17:54 2011 > New Revision: 1065170 > > URL: http://svn.apache.org/viewvc?rev=1065170&view=rev > Log: > On the 'diff-optimizations-bytes' branch: > > Silence compiler