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

Re: Property diff producing wrong results...

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-03-20 01:20:21 CET

On Mon, 19 Mar 2007, John Szakmeister wrote:

> Garrett Rooney wrote:
> [snip]
> > I suspect it's always been like this. Property diffs are manually
> > created as a removal of everything that used to be there (-blah) and
> > an addition of what is there now (+foobar). When there's more than
> > one line it ends up looking like this.
>
> I went back and looked at the issue, and that's exactly what it was
> trying to convey. Funny, I haven't really noticed this before. I at
> least thought it worked as expected at one point.
>
> Thanks for the clarification. Daniel, has the pseudo-diff been
> implemented on the merge-tracking branch already?

Yes.

merge-tracking/subversion/libsvn_client/diff.c:display_prop_diffs()
now calls display_mergeinfo_diff(), which iterates over the merge
history and displays reverts and merges in a more human-digestable
manner.

  • application/pgp-signature attachment: stored
Received on Tue Mar 20 01:24:54 2007

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