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

Help with Vendor branches/releases

From: Nathan Watson-Haigh <nathan_at_watsonhaigh.net>
Date: 2007-11-26 11:22:34 CET

Hash: SHA1

I've had a look through the SVN book (http://svnbook.red-bean.com/) and
am still somewhat confused on how to achieve my desired effect.

A project (PHP based software) I'm working on uses code from a third
party (also stored in an SVN repo). However, we need to
modify/reorganise the code so that it works as a plugin. I want to make
it easier to upgrade the code when new releases of the third party code
is made. I thought that the use of vendor branches/tags could/would
help. But I can't get it to work as I had expected it to.

I've tried setting up:
   |___ vendor_branches
   | |___ vendor1_current
   |___ vendor_tags
               |___ vendor1_release_x.y.1
               |___ vendor1_release_x.y.2

I used the svn_load_dirs.pl script to load data (unzipped files) from
the vendor's tagged releases, such that the data is loaded into vendor
branch, so it's HEAD always has the latest code, but I have tags
generated from the vendor branch, so I can always reference the release
directly with a tag.

Now, the questions I particularly have are:
1) Are my code changes and file rearrangement supposed to go on the
2) If so, when I next run svn_load_dirs.pl will it be able to match the
files of the new release to the HEAD of the vendor_branch where my own
changes have been made?
3) Again, if 2 is correct, then the vendor_branch HEAD is a mixture of
my changes and the vendor's changes from each release to the next.
Because this code is used as a plugin, it would make more sense to have
this code at something like:

   |___ trunk
           |___ modules
                    |___ module1

Where module1 dir is actually the "vendor_branch".

I have some further compilations, but it would make more sense to get
feedback on the above first, otherwise there would be too many "what if's".

Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 26 11:23:00 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.