Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

On Fri, Jul 24, 2009 at 11:07 AM, Daniel Näslund<daniel_at_longitudo.com> wrote:
> Hey!
>
> This is my first attempt as a Subversion coder. Please be nice to me!
>
> It works for patch(1) but I haven't tried it on any other patch programs.
>
> Some background on the subject:
> http://subversion.tigris.org/ds/viewMessage.do?dsMessageId=977146&dsForumId=462
>
> / Daniel Näslund
> [[[
> Fix part of issue 1493: Property diffs/merge should use libsvn_diff.
> For properties I have removed the diff headers and replaced the @@-characters
> with ##.

Out of curiosity... why? Aren't people used to seeing "@@" for diff
headers? Shouldn't the "file-level" headers make it clear that it's a
prop diff?

--dave

> *subversion/libsvn_diff/diff_memory.c
> (output_unified_flush_hunk2): Added parameter for choosing delimiter, for
> instance '##' instead of '@@'.
>
> *subversion/libsvn_diff/diff_memory.c
> (svn_diff_mem_string_output_unified2): Added parameter for choosing if the diff
> should be formatted as a property diff, '##' as delimiters.
>
> *subversion/include/svn_diff.h
> (output_unified_flush_hunk2): Declaration
> (svn_diff_mem_string_output_unified2): Declaration
>
> *subversion/libsvn_client/diff.c
> (append_eol): Appends an end of line character if missing.
>
> *subversion/libsvn_client/diff.c
> (display_prop_diffs): Use libsvn_diff for diffing properties.
> ]]]
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2375349

-- 
glasser_at_davidglasser.net | langtonlabs.org | flickr.com/photos/glasser/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2376188