[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: Gary Thomas <gary_at_mlbassoc.com>
Date: 2005-01-22 02:06:34 CET

On Fri, 2005-01-21 at 16:29 -0500, François Beausoleil wrote:
> 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.

Sadly, that did not seem to be what I experienced. I performed the
merge, pretty much as you outlined below, and the files which had
overlapping changes ended up with conflicts that I had to fix up
by hand.

>
> > 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

Thanks for the help

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 22 02:10:50 2005

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