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

Re: partial branching?

From: Michael Reinelt <michael_at_reinelt.co.at>
Date: Fri, 25 Jan 2008 08:46:28 +0100

Hi there,

Srilakshmanan, Lakshman schrieb:
> Refer to external
> http://svnbook.red-bean.com/en/1.4/svn.advanced.externals.html
I don't think that this is was Nathaniel was asking for...

>> I'm managing a single project for several clients. The software should
>> function identically for each client, but a few code modules must be
>> implemented differently for each client's database environment.

That's exactly what I am doing here.

I keep all the "common" files in trunk, and I have a branch for every
customer, which contains the files from trunk plus the customer-specific

I have a lot of duplicate files (every file from trunk is duplicated in
every branch), but as this are "cheap copies", this doesn't hurt too
much. OTOH, this has the advantage of having the possibility to change a
common file in a branch, test it in the customer environment, and decide
if the change should be backportet to trunk (and in a 2nd step to every

SOmetimes I decide that a customer-specific file should no longer
customer-specific but common, so I simply copy it to trunk. Sometimes I
decide it has to be the other way round (a former common file becomes
customer-specific): I simply delete it from trunk.

To maintain all this stuff, I wrote several scripts that compare the
common files from trunk with all branches, and suggests diffs and/or
merges (based on 'svn diff --summarize')

One drawback is that every change to trunk results in a diff for every
branch (and I got about 20 branches), so the commits (and the repository
itself) becomes quite big. A proper solution would be a "svn replace"
instead of a "svn merge", but I couldn't find the time to improve my
scripts to to this (apart from the fact that there is no "svn replace"

HTH, Michael

Michael Reinelt <michael_at_reinelt.co.at>
GPG-Key 0xDF13BA50
ICQ #288386781
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-25 08:46:53 CET

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.