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

Re: Weird svn merge tracking property values

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 18 Aug 2008 11:14:03 -0400

On Mon, Aug 18, 2008 at 11:03 AM, Murli Varadachari
<mvaradachari_at_facebook.com> wrote:
>>The mergeinfo property does not include the "natural history" of a
>> path.
>>So in the perfect case, the property would have had this value:
>> /tfb/trunk/www:r115503-115504
> what about all the values prior to the branch point I.E < 115503.

Well the question at the end was an attempt to arrive at answer about
that. I do not know why those values were included.

> Does the merge command recognize the branch point internally.

Yes, that is why it does not include the natural history in the mergeinfo.

> Syntactically isn't
> there some way to indicate that no revisions prior to 11503 would be merged.
> The current syntax appears to indicate that 1155503-115504 is cherry picked
> and that all other revisions could potentially be merged?

You can enter the value yourself if it bothers you. Someday,
hopefully, this will not be stored in a visible property. The way to
examine the contents is via the svn mergeinfo subcommand.

> Also if I run " svn mergeinfo —show-revs eligible
> svn+ssh://HOST/svnroot/tfb/branches/tfb1" it shows the latest rev point as
> being eligible to merge even though that is due to some unrelated commits —
> I think this was raised earlier as being confusing to the user since there
> is really nothing to merge.

Unfortunately there is no single right answer as to how this ought to
work. It originally worked the way it does not, at your request we
changed it to not include this, but we ultimately put it back as that
behavior was interfering with the ability to elide away subtree
mergeinfo. I suspect this will change again eventually.

>>As for the other values, did you look to see if there was any property
>>value before you did this merge?
> not sure

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-18 17:14:34 CEST

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

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