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

Re: Archaic branch/merge question

From: François Beausoleil <fbeausoleil_at_ftml.net>
Date: 2005-01-21 22:29:02 CET

On 2005-01-13 10:03, Gary Thomas wrote:
> 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.

That would not happen, because when you merge, you specify a location,
as well as revisions. If some revisions changed something in another
location, nothing would be done for these.

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

A simple merge:
svn co svn://repos/branch1
svn merge -rX:Y svn://repos/branch2

Bye !
François

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 21 22:29:46 2005

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