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

Archaic branch/merge question

From: Gary Thomas <gary_at_mlbassoc.com>
Date: 2005-01-13 16:03:39 CET

I have a large SVN repository which I converted from CVS. The
original CVS repository spanned many years, projects, etc. It
had a [simplified] structure like this:

    + - branch1 - ... many updates
         + branch2 - other updates

Which is read as "branch1" was created from the trunk on x/y/z.
Later, after some updates, "branch2" was created from branch1.
Work continued on branch1 and separately on branch2. There
were tags applied at each branchpoint.

My SVN repository (created by cvs2svn) has all of this history.
What I'd like to do now is take the changes that were unique to
branch2 and merge them onto the current branch1. In CVS this
is simple using update, joining the changes from branch2-branchpoint
and the current branch2 head.

Note that cvs2svn converted the repositories in such a way that
the revisions used by the two branches are intermingled, so (if
I understand correctly), a simple merge from branch2's starting
revision and it's head would have overlapping changes with some
that are on branch1.

How can I perform this same [merge] operation using SVN?

Gary Thomas                 |
MLB Associates              |  Consulting for the
+1 (970) 352-4947           |    Embedded world
http://www.mlbassoc.com/    |
email: <gary@mlbassoc.com>  |
gpg: http://www.chez-thomas.org/gary/gpg_key.asc
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 13 17:30:43 2005

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.