[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 12:13:47 CEST

On Fri, 07 Jul 2006 14:12:21 +0530, Kamesh Jayachandran
<kamesh@collab.net> wrote:

> Madan U Sreenivasan wrote:
>> 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
> Quick question:
> Can you from the above output can you see what got changed? (Scroll down
> for answers)
> Things could be even worser.

Same applies even for multiple changes across 100 different files in the
codebase. The complexity of the user changes, I beleive are not sufficient
to change the beahvior of the 'diff' functionality.

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

Nah. The main point is, It would be confusing to show a particular diff,
while actually storing something else in the backend(especially when the
user is allowed to hand-edit it).

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

We are talking the same thing here.


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