perl-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stas Bekman <s...@stason.org>
Subject Re: syncing branches with trunk, how?
Date Thu, 12 May 2005 20:06:06 GMT
Joe Orton wrote:
> On Wed, May 11, 2005 at 02:58:30PM -0400, Stas Bekman wrote:
> 
>>Markus Wichitill wrote:
>>
>>>Stas Bekman wrote:
>>>
>>>
>>>>Seeing how painful was the last branch's merge, I was wondering if 
>>>>there is an automatic way to keep the branch in sync with the trunk. 
>>>
>>>
>>>Unfortunately not, that would require merge tracking, which is one of 
>>>Subversion's medium-term goals.
>>>
>>>http://subversion.tigris.org/roadmap.html
>>
>>Thanks Markus. So what are the current workarounds? Is there an easy way 
>>to replay the commits? Will it create problems when doing the merge back 
>>to the trunk?
> 
> 
> You can use a semi-automated technique by recording the last-merge-point 
> as a property; I've been using this script:
> 
> http://people.apache.org/~jorton/svn.remerge
> 
> for one of my projects, it seems to work quite well.  To begin, set the
> "merge-point" property on the branch to the revision number of the last
> merge from the trunk, and just run the script to merge again from a wc
> of the branch.
> 
> (it assumes you have the standard repos structure with a "trunk/"
> alongside "branches/)

Thanks a lot, Joe. So since I have tagged the trunk before doing the 
branch, can I now go back in time and add a merge-point? I guess I just 
need to checkout the tag and add a merge-point? is that right? if not how 
do I do it?

-- 
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Mime
View raw message