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

Re: tricks for revision control for customization of an external source

From: Ryan Schmidt <subversion-2008b_at_ryandesign.com>
Date: Tue, 15 Apr 2008 15:09:36 -0500

On Apr 15, 2008, at 1:44 PM, Anthony Ettinger wrote:
> I have ./htdocs define as an svn:external....all is well, but I am
> overriding logo.gif and would like to commit this into my local
> repository somehow, as I do not have access to the external
> repository, nor would it make sense to check in if I did.
>
> Short of leaving it as a locally modified file, are there any other
> ways to override the one or two files where this is necessary?
>
> Mainly, logo.gif and config.php are customized for each instance of
> "TheApp" that I pull from an external repository.

Not using externals, no. The alternative would be to consider the
external htdocs tree a vendor branch, import it wholly into your own
repository under /vendor/foo/current (where foo is the name of the
external project), copy this to /vendor/foo/1.2.3 (representing the
version of the external project), copy this to somewhere else in the
repository where you can modify it like /bar/foo (where bar is your
own project name), then modify and commit your modifications in /
projects/bar/foo. When a new version of the external project is
released, you use svn_load_dirs.pl to load it into for example /
vendor/foo/1.2.4 (and /vendor/foo/current), and then you can merge
those changes into /bar/foo with "svn merge $REPO/vendor/foo/1.2.3
$REPO/vendor/foo/1/2/4 ." See the section in the book on vendor
branches for more information:

http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-15 22:09:59 CEST

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