Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-12-03 Thread Daniel Näslund
> >> [[[ > >> Do not display a binary property diff in the interactive conflict > >> resolver. > >> > >> * subversion/include/svn_io.h > >> (svn_stream_detect_binary_mimetype): New. Declare. > >> > >> * subversion/libsvn_subr/stream.c > >> (svn_stream_detect_binary_mimetype): Check if atleast 8

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-12-03 Thread Gavin 'Beau' Baumanis
Ping. This Patch submission has received no new comments. Beau. On 20/11/2009, at 06:00 , Daniel Näslund wrote: > On Wed, Nov 18, 2009 at 10:37:01AM +0100, Daniel Näslund wrote: >> Hi! >> >> [[[ >> Do not display a binary property diff in the interactive conflict >> resolver. >> >> * subver

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-19 Thread Daniel Näslund
On Wed, Nov 18, 2009 at 10:37:01AM +0100, Daniel Näslund wrote: > Hi! > > [[[ > Do not display a binary property diff in the interactive conflict > resolver. > > * subversion/include/svn_io.h > (svn_stream_detect_binary_mimetype): New. Declare. > > * subversion/libsvn_subr/stream.c > (svn_

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread C. Michael Pilato
Daniel Näslund wrote: > * subversion/libsvn_subr/stream.c > (svn_stream_detect_binary_mimetype): Check if atleast 85 % of the > bytes fall within the ascii range of printable characters. Was there no good way to factor out similar code from svn_io_detect_mimetype2()? Looks like a bunch of o

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread Julian Foad
Daniel Näslund wrote: > [[[ > Do not display a binary property diff in the interactive conflict > resolver. The concept of a "binary property" is new in this patch, so a few additional words would be useful here, to say what change you are making: Detect heuristically whether the property val

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread Stefan Sperling
On Wed, Nov 18, 2009 at 11:01:51AM +0100, Daniel Näslund wrote: > On Wed, Nov 18, 2009 at 10:49:15AM +0100, Stefan Sperling wrote: > > On Wed, Nov 18, 2009 at 10:37:01AM +0100, Daniel Näslund wrote: > > > Index: subversion/libsvn_subr/stream.c > > > =

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread Daniel Näslund
On Wed, Nov 18, 2009 at 10:49:15AM +0100, Stefan Sperling wrote: > On Wed, Nov 18, 2009 at 10:37:01AM +0100, Daniel Näslund wrote: > > Index: subversion/libsvn_subr/stream.c > > === > > --- subversion/libsvn_subr/stream.c (revision 881

Re: [PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread Stefan Sperling
On Wed, Nov 18, 2009 at 10:37:01AM +0100, Daniel Näslund wrote: > Index: subversion/libsvn_subr/stream.c > === > --- subversion/libsvn_subr/stream.c (revision 881392) > +++ subversion/libsvn_subr/stream.c (arbetskopia) > @@ -1347,3

[PATCH] Do not display a binary prop diff in interactive conflict resolver

2009-11-18 Thread Daniel Näslund
Hi! [[[ Do not display a binary property diff in the interactive conflict resolver. * subversion/include/svn_io.h (svn_stream_detect_binary_mimetype): New. Declare. * subversion/libsvn_subr/stream.c (svn_stream_detect_binary_mimetype): Check if atleast 85 % of the bytes fall within the