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

Re: unique branch problem

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-10-22 23:32:15 CEST

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.

>> 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?

I don't think there is a problem here. You have a working copy of
your branch in your unofficial repository. You merge changes from the
official repository into your working copy. You test the changes. And
then you commit your working copy.

As to why it's touching your .svn directories, an svn merge is not
just doing a command line merge. If the merge causes a file to be
added in your working copy, then the equivalent of an svn add is also
performed, which has to do things in the .svn directories to record
this fact. If the merge causes properties to change on existing
files, or files to get deleted, that too has to be noted in the .svn
directory. Don't worry about it. It's just Subversion doing what it
has to do.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Oct 22 23:33:56 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.