[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: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-07 16:45:00 CEST

On Fri, 07 Jul 2006 19:33:09 +0530, Garrett Rooney
<rooneg@electricjellyfish.net> wrote:

> 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,

Manual merges need to be hand-edited... (or maybe we should provide an
equivalent of the --record-only option in svnmerge!)


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:15:06 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.