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

Re: Subversion 1.5 Release decision?

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 22 May 2008 16:04:10 -0400

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 .
Conflict discovered in 'STATUS'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
--- Reverse-merging r31185 into '.':
C STATUS
U subversion/libsvn_client/merge.c
U subversion/libsvn_client/mergeinfo.c
U subversion/libsvn_client/mergeinfo.h
--- Reverse-merging r31185 into 'subversion/bindings/swig':
 G subversion/bindings/swig
--- Reverse-merging r31185 into '.':
U subversion/tests/cmdline/merge_tests.py
--- Reverse-merging r31185 into 'CHANGES':
 G CHANGES
--- Reverse-merging r31185 into '.':
 G .
Conflict discovered in 'STATUS'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
--- Reverse-merging r31186 into '.':
C STATUS
G subversion/libsvn_client/merge.c
--- Reverse-merging r31186 into 'subversion/bindings/swig':
 G subversion/bindings/swig
--- Reverse-merging r31186 into '.':
G subversion/tests/cmdline/merge_tests.py
--- Reverse-merging r31186 into 'CHANGES':
 G CHANGES
--- Reverse-merging r31186 into '.':
 G .
Conflict discovered in 'STATUS'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
--- Reverse-merging r31218 into '.':
C STATUS
U subversion/libsvn_wc/merge.c
G subversion/tests/cmdline/merge_tests.py
 G .
mark-phippards-computer:svn-1.5.x mphippard$ svn diff --depth=empty .

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /trunk:r30746-30747,30949,30962,31159,31179
   Reverse-merged /branches/1.5.x-r31159-r31179:r31193

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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:04:26 CEST

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