Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: [PATCH] issue 1493 - use libsvn_diff for diffing props

subversion
Discussion topic

Back to topic list

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

Author glasser
Full name David Glasser
Date 2009-07-27 18:21:24 PDT
Message On Fri, Jul 24, 2009 at 11:07 AM, Daniel Näslund<daniel@lo​ngitudo.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.ti​gris.org/ds/viewMess​age.do?dsMessageId=9​77146&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_d​iff/diff_memory.c
> (output_unified_flush_hunk2): Added parameter for choosing delimiter, for
> instance '##' instead of '@@'.
>
> *subversion/libsvn_d​iff/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_c​lient/diff.c
> (append_eol): Appends an end of line character if missing.
>
> *subversion/libsvn_c​lient/diff.c
> (display_prop_diffs): Use libsvn_diff for diffing properties.
> ]]]
>
> --------------------​--------------------​--------------
> http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=462​&dsMessageId=237​5349



--
glasser at davidglasser dot net | langtonlabs.org | flickr.com/photos/glasser/

« Previous message in topic | 10 of 11 | Next message in topic »

Messages

Show all messages in topic

[PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-24 11:07:21 PDT
     Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-07-24 12:13:46 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-24 14:03:20 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-27 03:48:33 PDT
             Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-08-03 10:23:59 PDT
                 Changed order when diffing with --depth option Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-08-04 04:00:57 PDT
                     Re: Changed order when diffing with --depth option stsp Stefan Sperling 2009-08-04 04:30:47 PDT
                 [PATCH v3] issue 1493 - use libsvndiff for diffing properties Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-08-04 10:55:32 PDT
                     Re: [PATCH v3] issue 1493 - use libsvndiff for diffing properties Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-08-04 17:18:01 PDT
     Re: [PATCH] issue 1493 - use libsvn_diff for diffing props glasser David Glasser 2009-07-27 18:21:24 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-07-28 10:05:43 PDT
Messages per page: