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

Re: Partially reintegrate changes

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 18 Feb 2010 07:37:32 -0800

On Thu, Feb 18, 2010 at 7:17 AM, Jacob Weber <jacob_at_jacobweber.com> wrote:
> Let's say I have a branch where I develop two features, X and Y. I then want to merge only X back
> into the trunk. I want to do some further development on Y, and merge it into trunk later.
>
> Is this possible with Subversion?

Yes. When merging from branch to trunk, you would need to specify the
specific revisions to merge. You could not use reintegrate. Let's
assume when you commit this merge to trunk that revision 200 is
created.

Back on the branch you should run:

svn merge --record-only -c200 ^/trunk

To record the merge. Now you can just do normal synch merges with
trunk and reintegrate the branch when you are done. 

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2010-02-18 16:38:05 CET

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.