First of all, thanks to everyone for your quick and informative responses.
> svn merge -r<previous>:<current> http://example.com/project/trunk
> >
> > If I do that inside of a checkout of my project, it works. If i do
> > that inside of an export of my project, it complains.
>
> Basically, you'd wanted the changes from <previous> to <current> of
> example.com/project/trunk <http://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?
which does a merge into your repository directly. Svn merge needs to
> work on a working copy so it can attempt to find where the changes need
> to go, especially if you've already made some local modifications
> (similarly, svn diff doesn't work with a non-working copy). If what you
> tried were allowed, how would svn merge handle conflicts?
>
My understanding was that svn merge acted just like command line merge,
taking the diff between two files and (more or less) patching it to the
third. If svn merge takes more complex history information into
consideration, then that only accentuates my concern: since it is a working
copy of _my_ project and not a working copy of the foreign project, is svn
working with history (or other .svn) data from two worlds, resulting in
currupted .svn files?
Thanks again,
John
Received on Fri Oct 21 18:10:21 2005