[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: Fisher, John <jfisher_at_forthrightsolutions.com>
Date: Mon, 19 May 2008 10:49:31 -0500

If you can't figure out the subversion merge, or it doesn't fit your
specific needs, you can always make two folders (a working copy with
your branch and a working copy of his branch). Then, use a tool like
WinMerge or Beyond Compare to merge the specific changes you would like.

The subversion merge is based upon revisions. So, if he committed a
large number of changes in one revision, you would not be able to easily
merge specific changes. On the other hand, if each change you want was
committed individually as separate revisions into his branch, then
subversion merge process should do what you need.

John

-----Original Message-----
From: Brian Kendig [mailto:brian_at_enchanter.net]
Sent: Monday, May 19, 2008 10: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 17:50:24 CEST

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