On Thu, May 22, 2008 at 4:04 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Thu, May 22, 2008 at 3:54 PM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>> Hyrum K. Wright wrote:
>>>
>>> Huh? We've *always* released from the tip of the 1.y.x branch.
>>> Releasing from something other than that seems like it would involve a
>>> bit more process than we currently use, but maybe the new features make
>>> that possible now. Personally, I'd rather not mess with additional
>>> release branches; if we don't want to include stuff that's already been
>>> merged, let's just back it out, cut the tarball, and then remerge it (and
>>> pray mergetracking works as advertised).
>>
>> "We've always done it that way" isn't necessarily the best argument for a
>> particular action, but in this case, +1. Merge tracking doesn't suddenly
>> making the "soft costs" of branch management go away. Let's just
>> reverse-merge stuff we don't want (which should re-add those things to
>> STATUS, though we then want to move them into the 1.5.1 recommendations),
>> and carry on.
>
> I tried the reverse-merge and it seemed to work as we would hope:
>
> ark-phippards-computer:svn-1.5.x mphippard$ svn merge -c-31185,-31186,-31218 .
Comments on two of the three backports we are considering reversing:
#1) 31185: r30949, r30962 from trunk. Fix issue #3188. Mergeinfo on
switched targets/subtrees should elide to repos.
This will only affect those who merge to targets with switched
subtrees. Even then, the worse problem I see is that you might end up
with some redundant explicit mergeinfo on those switched subtrees.
#2) 31186: r30746, r30747 from trunk. Fix a minor merge range
notification header bug.
This should only affect merge notifications when a merge deletes a
subtree which has explicit mergeinfo. The merge is still correct,
it's just the notification that is wrong.
Hardly the end of the world if either of these doesn't make it in 1.5.0.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-22 22:32:03 CEST