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. :^)
What I -thought- it did was diff all the contents of
/repository/Development against the current contents of
/repository/Experimental and apply those diffs to the current contents
of ~rvs/Experimental.
The output that I get is exactly what I would have expected from that
operation, specifically that everything which had its svn:executable
property changed on Development after the branch, received that update
in ~rvs/Experimental.
I guess what I'm missing is what it means to have the U in the second
column of the output if a property in my WC is not actually being
updated? I assume that it means it would be updated in some
circumstance, I just can't figure out what that circumstance would be if
it is not 'svn merge'.
> > [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
Yields exactly the same result.
rvs
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 22 19:19:34 2002