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

On Jan 18, 2007, at 17:47, Jared Silva wrote:

> Assume, for example, I have the following:
> /repos1/vendor/current
> /repos1/vendor/1
> /repos1/vendor/2
>
> I then do:
> svn copy /repos1/vendor/1 /repos1/project
>
> I then make changes to /repos1/project
>
> I can merge the changes from vendor/1 and vendor/2 as follows
> (everything in same repository, non-disjoint working copies):
> svn merge /repos1/vendor/1 /repos1/vendor/2 /repos1/project
>
> Can I do the same using disjoint working copies? Maybe even
> externals?
> svn merge /repos1/vendor/1 /repos1/vendor/2 /repos2/project

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?

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.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org