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

RE: Re: unique branch problem

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2005-10-24 14:04:51 CEST

Ryan Schmidt wrote:
> On Oct 21, 2005, at 18:03, John Joseph Bachir wrote:
>
>>> Basically, you'd wanted the changes from <previous> to <current> of
>>> example.com/project/trunk into your copy. To do this, you'd need to
>>> either do it within a working copy of your own, or as:
>>>
>>> svn merge -r<previous>:<current> http://example.com/project/trunk \
>>> http://svn.johnserver.com/johnbranch/trunk
>>
>> Is the same as being inside of my local checkout and executing the
>> command i mentioned?
>>
>
> svn merge always operates on a local working copy. It cannot operate
> on an export, and it cannot operate on a repository URL as David Gale
> suggests above.

Oh, I guess I mis-read the book.
<http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.merge.html> lists
an extra, optional argument for svn merge ([WCPATH]), but none of the
examples on the page use that; I'd assumed it was like the other
commands which allow for working directly on a URL. Of course, if
that'd been the case, the book probably would've used a different
variable name, so now I'm just embarassed. :-)

-David

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 24 14:12:50 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.