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

Re: merge and properties

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-11-22 18:53:10 CET

"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 :)

> [snip a bunch of lines just like this]
> U /home/rvs/Experimental/Perl/Masters/RunAll.pl
> =============================================================
>
> Which I interpret to mean that the WC is getting its properties updated
> exactly as I would expect.

No, it means that the change to convert the first URL into the second
URL does not conflict with your working copy. It does not conflict
because it is a trivial merge, the change is already present.

You probably want to run a command like

svn merge -rREV1:REV2 http://myserver/repository/Development ~rvs/Experimental 

-- 
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 18:53:59 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.