[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: Jared Silva <jayrod_at_gmail.com>
Date: 2007-01-19 01:43:21 CET

Ryan Schmidt wrote:
> I don't understand what you're trying to do. What do you mean,
> disjoint working copies? Which working copy is disjoint from which
> other working copy?
>

A disjoint working copy operation is performing a Subversion operation
on working copies that connect to different Subversion repositories.

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 19 01:43:51 2007

This is an archived mail posted to the Subversion Users mailing list.