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

Re: [Fwd: Re: merge and properties]

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-11-22 21:54:32 CET

"Ronald V. Simmons" <Van_Simmons@thesimmonses.net> writes:

> > On Fri, 2002-11-22 at 13:23, Ronald V. Simmons wrote:
> > > On Fri, 2002-11-22 at 12:53, Philip Martin wrote:
> > > > "Ronald V. Simmons" <Van_Simmons@thesimmonses.net> writes:
> > > >
> > > > > > svn merge http://myserver/repository/Development
> > > > > http://myserver/repository/Experimental ~rvs/Experimental
> > > > > rvs's password:
> > > >
> > > > This command does not do what you think it does :)
> > >
> > > Clearly. :^)
> > > >
> > > > You probably want to run a command like
> > > >
> > > > svn merge -rREV1:REV2 http://myserver/repository/Development ~rvs/Experimental
> > >
> > > Yields exactly the same result.
> >
> > Okay I take it back. I was able to get the command that Philip
> > recommended to work (I had reversed the revno's). I gather that was
> > actually the problem with my first version of the command too.

Be careful... to move changes from one branch to another the

  svn merge -rREV1:REV URL PATH

form is preferred, the two URL form of the command only works because
you have no changes committed on your working copy branch. If you had
committed changes to the working copy branch then the two URL command
would undo those changes as well as merging the changes from the other
branch. (Unless of course you play games with @REV, but if you are
going to do that you may as well use the -rREV1:REV2 form.)

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 22 21:55:16 2002

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