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

Merge Tracking Metadata Interface

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-06 01:02:20 CEST

As I was watching dlr tweak tests on the merge-tracking branch to
expect the presence of a svn:mergeinfo property, I started to wonder
if that's really how we want to show things to the user. Do we want
the fact that merge info has been stored in the working copy to show
up in status output in the same place as we indicate a change to (for
example) svn:ignore? I'm not positive one way or the other, but I
think we should discuss it before Dan spends days tweaking tests.

More important, in my mind, is how these property changes show up in
diffs. I just noticed that when you do a diff after using svnmerge.py
to merge a change the diff output isn't all that friendly. You end up
with the old long-ass line of revision ranges, then the new long-ass
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.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 6 01:02: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.