← Back to team overview

bzr-doc team mailing list archive

Re: the branching thing


2009/12/2 Sebastian Spiess <sebastian.spiess@xxxxxxxxx>:
> Hi Bzr-doc List,
> I've used bazaar now for a while - I'm not a programmer so my usage is
> mostly keeping track of some batch files and /etc/* and I'm not familiar
> with a typical code colaboration work flow.
> By now I've read quite a few pages in
> http://doc.bazaar-vcs.org/bzr.dev/en/user-guide but I could not figure
> out how I get started with having branches etc.
> My current challenge is that I've got a .htaccess file, sort of my
> trunk.
> Now I want to branch the htaccess file for multiple domains with small
> variations.
> If I have a change which will affect all branches I do the modification
> in trunk and pull in the branches. Thats what I think I need to do - but
> how exactly.

So it seems to me that probably you don't want to eventually merge all
the different domains together, but to have several different related

The way I would probably tackle this is to use apache's configuration
setup so that each domain actually reads multiple files - one for the
common stuff, one for things specific to that domain, perhaps some
others if there are classes of domains that work together.  I can't
recall off hand if there is an Include directive you can use in
.htaccess, but it's probably possible.  Then put the whole suite of
config files into bzr.

Martin <http://launchpad.net/~mbp/>

Follow ups