[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-07-07 10:42:21 CEST

Madan U Sreenivasan wrote:
> 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
IIRC prop diff output is not meant for any tools and just for human eyes.
I feel the pretty output of 'svn:mergeinfo' prop would be more human
friendly than current svn diff output
See how bad it is
Property changes on: .
___________________________________________________________________
Name: svn:mergeinfo
-/branches/b1:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b2:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b3:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b4:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b5:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b6:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b7:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b8:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b9:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b10:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b11:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b12:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b13:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b14:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125

+/branches/b1:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b2:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b3:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b4:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b5:22, 31-46, 48-61, 68-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b6:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b7:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b8:22, 31-46, 48-61, 65-76, 79-92, 105-112, 115-118, 120-125,
135-140
/branches/b9:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b10:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b11:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b12:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b13:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125
/branches/b14:22, 31-46, 48-61, 65-76, 79-92, 96-102, 105-112, 115-118,
120-125

Quick question:
Can you from the above output can you see what got changed? (Scroll down
for answers)
Things could be even worser.

> 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.
If I understand you 'User should never be hidden the actual changes', we
show it when he does a 'svn propedit/pg/pl -v'.
If I understand you in favour of exposing the internals so that it would
make him to knowledgable to tweak this property to block merges and
such. I don't think it outweighs the crisp info one would be willing to see.
> 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 propedits.
He would not be surprised unless he knows subversion internals or did
'propedit' atleast once(Me included it was a info for me yesterday, but
it does not matter for not knowing this as long as I know what for
'svn:executable' is)

With regards
Kamesh Jayachandran

Answer to quick question Revert of /branches/b8:96-102 and merge of
135-140, revert of /branches/b5:65-67.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 10:41:31 2006

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