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

Re: Vendor drop management

From: Rupinder Singh Mazara <rmazara_at_masterfile.com>
Date: 2005-08-23 18:20:46 CEST

which brings me to the last line of page 123 to quote "But we are
responsible for telling Subversion how the source file layout changed
from vendor drop to vendor drop"

is the process that i outline bellow adequate for the purpose of
updating my customized version of the open source project

>that's discussed under "Vendor branches" in the subversion book.
Initialization ( To be done only once )
First of all we create an empty repository on the svn sever
svnadmin create /svn-repos

Get the base line revision of Project (5548)
svn export -r 5548 http://svn.someserver.org/svn/open_source/trunk

Check out "my_custom" project (initially it's a copy of 5548 with our
own modifications)
svn checkout svn://mysvnserver/my_custom/trunk working_copy

Import it into the repository
svn import --no-auto-props -m "Import baseline 5548" 5548_export
question: how to set correctly the svn properties to the imported files?

Make a tag for version 5548
svn copy -m "Tag 5548 vendor drop" svn://mysvnserver/open_source/current

Update Proccess
Get a new revision (in this example, we get revision 5500)
svn export -r 5500 http://svn.someserver.org/svn/open_source/trunk

And we update our current version of the "open_source" project in our
svn repository
svn_load_dirs.pl -t 5500 svn://mysvnserver/open_source current 5570_export

Merge files
svn merge svn://mysvnserver/open_source/5548
svn://mysvnserver/open_source/5570 working_copy

Resolve and Commit any conflicts

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 23 18:23:29 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.