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

Re: How do I selectively merge two branches?

From: Ron Grabowski <rongrabowski_at_yahoo.com>
Date: Mon, 19 May 2008 14:38:59 -0700 (PDT)

This isn't a TSVN solution but I find the svnmerge.py program to be quite helpful (there's a svnmerge.exe version too):

 http://www.orcaware.com/svn/wiki/Svnmerge.py

Its really helped us get our heads around branches and we use them much more often with the help of svnmerge.exe. The tool tracks what changes are available for merging and lets you cherry pick what you want merged. It also generates nice log message containing a summary of items that will be merged. From what I've read, a lot of this will be available in svn 1.5.

You should be able to configure svnmerge to work with your branch and trunk to see exactly what items are missing.

----- Original Message ----
From: Brian Kendig <brian_at_enchanter.net>
To: users_at_tortoisesvn.tigris.org
Sent: Monday, May 19, 2008 11:38:22 AM
Subject: How do I selectively merge two branches?

Back on February 14, a member of my development team made a branch of our
codebase. He's been working with his branch independently since then, but
his branch doesn't contain any of the code changes the rest of us have made
to our branch since then.

How do I use TortoiseSVN to see exactly where his branch differs from our
branch, and then choose which changes to apply to his?

I can't figure out the 'Merge' menu option; it seems to want to completely
turn his branch into our branch (or vice-versa). I can't see where to tell
it whether or not to merge particular changes.

-- 
View this message in context: http://www.nabble.com/How-do-I-selectively-merge-two-branches--tp17319859p17319859.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-05-19 23:39:09 CEST

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