[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 08:19:53 CEST

On Thu, 06 Jul 2006 14:09:53 +0530, Malcolm Rowe
<malcolm-svn-dev@farside.org.uk> wrote:

> On Wed, Jul 05, 2006 at 04:32:25PM -0700, Eric Gillespie wrote:
>> "Garrett Rooney" <rooneg@electricjellyfish.net> writes:
>> > line of revision changes. Do we perhaps want to special case this
>> > property? Showing it as "Added rXXX" or "Removed rXXX"?
>> >
>> > I don't really have a well formed opinion here, but I'm leaning
>> > towards "it's ok for it to show up as a propchange in status", and "we
>> > should special case it in diff", but I'm curious what other people
>> > think about this.
>> +1
>> We already special-case at least svn:executable in diff.
> Really? I don't see that.
> Anyway, +1 from me also to inihibiting the output of mergeinfo-related
> properties in libsvn_client's diffs. It's an implementation detail,
> and I don't think it's ever useful to expose it in the default diff
> output.

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.
   Well, you may say svn:executable does show a "*" when the user said "1".
Well, "*" is what is actually stored in the property. So, the user is not
gonna be surprised about what he sees in the diff and what he sees when he

   I agree with Garrett though that in 'status', we could show the
svn:mergeinfo property changes as related to the file instead of adding it
to the property changes listing that preceeds the file changes.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 07:49:47 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.