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

Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-11 19:10:07 CEST

On 7/7/06, Kamesh Jayachandran <kamesh@collab.net> wrote:

> [[[
> Patch by: Kamesh Jayachandran <kamesh@collab.net>
>
> Showing a diff of 'svn:mergeinfo' property like other property diffs
> will be very difficult to understand especially when the wc target has
> undergone large number of previous committed merges and many uncommitted
> local merges.
> * subversion/libsvn_client/diff.c
> (display_mergeinfo_diff):
> New function that shows a 'svn:mergeinfo' prop diff in a easily readable
> form.
> (display_prop_diffs): Calls display_mergeinfo_diff.
> ]]]

I think the consensus is we need to do something like this, but just
in case it isn't I'll post this updated version of the patch before I
commit to give people a chance to object.

This fixes a segfault when there is no original property value, and
adds some horizontal whitespace to improve readability, otherwise no
changes.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Jul 11 19:10:43 2006

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