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

Re: Merge Tracking Metadata Interface

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-07 16:03:09 CEST

On 7/7/06, Madan U Sreenivasan <madan@collab.net> wrote:

> I beg to differ, because of the following reasons
>
> 1) diff is supposed to show the difference (both old and new values), and
> not just a human interpretation of what was merged/reverted. For this kind
> of reporting, status would be a better place (or better still, the audit,
> reporting tools that we are planning to develop in phase 2.)
> 2) The reason we have a string representation for svn:mergeinfo is so that
> it is hand-editable (It is not just an implementation detail, we expect
> the users to update svn:mergeinfo to reflect manual merges). Showing
> interpreted info in diff and showing the original svn:mergeinfo value in
> propedit will confuse the user.

I think we're kidding ourselves if we think that these properties are
going to be hand editable for anyone who is not a Subversion
developer, and I think that producing useful diff output (i.e. that
can be consumed by a user) is more important than showing a literal
diff. It's not like the literal diff is actually being consumed by
any external tools (a-la patch) anyway. If we want a literal
transcription of what changed, we need a more robust diff format
anyway.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 16:03:54 2006

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