[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] issue 1493 - use libsvn_diff for diffing props

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 24 Jul 2009 20:07:12 +0200

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 ##.

*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

Received on 2009-07-24 20:42:57 CEST

This is an archived mail posted to the Subversion Dev mailing list.