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

Re: svn merge, disjoint working copies, and svn:externals

From: Ryan Schmidt <subversion-2007a_at_ryandesign.com>
Date: 2007-01-19 02:01:42 CET

On Jan 18, 2007, at 18:43, Jared Silva wrote:

>> When I want to update something in one of my projects that is a
>> vendor branch, I do this: Say I have a directory lib/foolib which
>> contains something that was originally copied from /vendor/foolib in
>> the repository:
>> svn co $REPO/project/trunk project-trunk
>> cd project-trunk
>> cd lib
>> svn cp $REPO/vendor/foolib/1.2.3 foolib
>> Now, when foolib 1.2.4 is released and I import it into my /vendor, I
>> can update my project like this:
>> cd project-trunk
>> cd lib
>> svn merge $REPO/vendor/foolib/{1.2.3,1.2.4}
>> There is only one working copy -- the working copy of my project.
> What if vendor/foolib was accessible through a Subversion repository,
> either via a URL or via svn:externals? I know you could not copy
> between your repository and the foolib repository, but could you merge
> changes in the foolib repository into your repository? i.e., could
> you still svn merge $REPO1/vendor/foolib/{1.2.3,1.2.4} for
> $REPO2/project/trunk if REPO1 != REPO2?

No. In previous versions of Subversion, this sometimes worked,
depending on weird circumstances, but I believe in 1.4 this was
"fixed" so that it never works.

Import the foreign project into your own repository using the methods
discussed in the vendor branch chapter of the book, such as the
svn_load_dirs.pl script. This also protects you against frustration
if their repository goes down or changes unexpectedly or their server
is unreachable.

To reply to the mailing list, please use your mailer's Reply To All  
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 19 02:02:46 2007

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.