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

Re: Re: Unable to cause a conflict in branch merge test

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-09-11 21:23:03 CEST

On 9/11/07, Bicking, David (HHoldings, IT)
<David.Bicking@thehartford.com> wrote:

> > > If I read the instructions differently, it appears that I
> > would locate
> > > my client in the workspace of my trunk, then specify the
> > range on the
> > > branch, like this:
> > > Cd /myworkspace
> > > Svn merge -r 47:53 /MyRepos/MyProj/Branches/MyBranch
> > >
> > > Would this then merge revisions between 47 and 53 into my workspace
> > > copy, which is the updated trunk?
> >
> > Yes. It will in essence produce a diff of MyBranch for that
> > revision range, then apply that diff to the current directory
> > - which should be a WC of your trunk.
> This appears to work, thanks. I was confused by what looks to me like
> incorrect TortoiseSVN documentation on the merge feature. Maybe I'll go
> over there and ask them about that.

It's probably the "To" and "From" getting you, I'm guessing? In most
cases, you'll want to right-click on your trunk WC, make the To and
From URLs the same (they're synced by default), and just use the
different revisions.

But...maybe I'll see you over on the other list :)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 11 21:19:48 2007

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.