On Oct 5, 2004, at 6:48 PM, Raye Raskin wrote:
> Hi everyone.
>
> In the 1.1 SVN book online:
>
>
> http://svnbook.red-bean.com/svnbook-1.1/svn-book.html#svn-ch-4-sect
> -3.1
>
> down about half way through the subsection where the svn merge is done:
>
> svn merge -r 343:344 http://svn.example.com/repos/calc/trunk
>
> Can someone please explain why the URL argument at the end of this
> command
> is needed? Can't SVN deduce it from the context of your working
> directory,
> i.e., from the contents of your local .svn directory?
No, because you are merging from the trunk to your "private branch"
(read the whole section in the book to get the context). You need to
tell subversion where to merge from. It doesn't make sense to merge
from the same branch that your working copy is - that's an "update" not
a "merge".
> In fact, let's suppose you ARE NOT in your corresponding calc/trunk
> working
> directory. Wouldn't it be an error, i.e., a mismatch in your actual
> working
> directory and the URL repository/path argument you entered?
>
Using the syntax above you would have to be in a working copy directory
for the merge to do anything.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 6 01:02:27 2004