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

svn move

From: William Ahern <wahern_at_barracudanetworks.com>
Date: 2005-11-06 02:46:56 CET

I'm maintining a vendor tree according to the suggestions in "Version
Control with Subversion".

I put the vendor tree in our "trunk". I want to move it elsewhere
because it's becoming huge and unwieldly for people to download
everytime they branch from the trunk. But, I'm afraid that if I move the
vendor tree I may lose the ability to merge vendor version differences
back into the project's version.

Does an "svn merge" utilize the knowledge that a directory tree was
originally a copy, or is it really a simple diff and it could be
executed against any two trees? If the former, if I move a tree will
this history be preserved?

For example, here's what I have now.

              ,project/zlib-1.x
             /
respos/trunk* ,1.2.3
             \ /
              `vendor/zlib*
                           \
                            `1.x

And I want to end up with the following

                ,project/zlib-1.x
               /
        ,trunk`
       /
respos* ,1.2.3
       \ /
        `vendor/zlib*
                     \
                      `1.x

without losing the ability--after upgrading to 1.2.4--to do:

svn merge repos/vendor/zlib/1.2.3 respos/vendor/zlib/1.x \
        respos/trunk/project/zlib-1.x

TIA,

Bill

-- 
William Ahern <wahern@barracudanetworks.com>
--------------------------------------------------
This message was scanned for Spam, Spyware and Viruses
For more information, please visit:
http://www.barracudanetworks.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Nov 6 02:48:45 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.