Re: [Monotone-devel] Comment on practice?

[Jack Cummings]

On Tue, Dec 18, 2007 at 06:27:34PM -0800, Judson Lester wrote:

> I have a branch that I use as the basis of software projects.  When I start a
> new project, I check out the *.*.project-base branch, update a config file, 
> and
> check it in as a new branch.  So far, this is like having a tarball of a
> project base.  What makes this worthwhile is the bash script I've written that
> propagates changes to project-base to every branch that has it as an ancestor
> (attached).  So far, this works like a dream, but I'm a little worried that
> perhaps I'm overlooking something that will bite me later.  Comments?

This is what I call a "templating" pattern. 

I'm a big fan of partitioning a project's sub-projects into individual
branches, and using merge_into_dir to assemble them all into a project branch.
This allows independent tracking of the sub-projects, fine grained selection of
sub-project versions, and "integration fixes" against the sub-projects in the
project branch. 

However, these two patterns are superficially incompatible -- you'll get a
obscure error message (Derek is fixing these) when you try and merge_into_dir
branches with a common ancestor. Superficial, because the tools to use are
"pivot_root", "explicit_merge", along with some renaming instead of
"merge_into_dir". 

--Jack 

--
Jack (John) Cummings                           http://mudshark.org/
PGP fingerprint: F18B 13A3 6D06 D48A 598D  42EA 3D53 BDC8 7917 F802