[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: Gleason, Todd <tgleason_at_impac.com>
Date: Mon, 19 May 2008 09:20:35 -0700

TortoiseSVN merge should be able to apply individual commits without a
problem. What you're doing with it is selecting a range of revisions to
diff (the "From" vs. the "To" represents the diff that Svn will
compute), and then applying it to a destination (your working copy).
You can repeat this as many times as you like with separate revisions.
Once you're done, you can commit all the merged changes.

To determine where the branches differ, you could use a general-purpose
diff tool like WinMerge, or you could just rely on the revision log to
guide you to the relevant commits made to the trunk (or as you say, "our
codebase"/"our branch"). Then you can switch over to the developer's
private branch, use Merge to diff and apply changes to your working
copy, and then commit it all into his private branch when done.

Note that if the developer has pulled in any of your changes into his
private branch, you may run into problems. To mitigate this, you'll
need to have a thorough review of the merged changes before committing
them. I suggest you code review it with the developer in question.

The key to merging, in case it isn't obvious yet, is to think of it as a
"diff-and-apply" operation. Diff two revisions from one branch, and
apply the diff to a working copy representing another branch (or the
same branch, if you're using merge to roll-back or re-create changes).

-----Original Message-----
From: Brian Kendig [mailto:brian_at_enchanter.net]
Sent: Monday, May 19, 2008 9:38 AM
To: users_at_tortoisesvn.tigris.org
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--tp1731985
9p17319859.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 18:21:10 CEST

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