Workflow with per-customer branches/patches

[Mike Noordermeer]

Hi,

I'm trying to find the correct workflow to use for a Java web project 
(jsp & servlets).

We have one codebase, but multiple customers who all need their own 
configuration and styling (html/CSS/images etc.). For that it seems 
appropriate to have one main/dev repository, and a repository(/branch) 
per customer.
This way we are able to develop in the main repository and push the 
changes to the customer repositories. Customer specific changes can be 
developed in the customer repositories.

My main problem arises when a customer wants to submit a patch (using hg 
push to their repo). We then need to merge this in the main branch, but 
we don't want the customer specific changesets. Current idea is to use 
hg transplant to pick the specific changesets we want, but doesn't this 
cause problems when we transplant from repo2 to repo1, and then push 
from repo1 to repo2 again?

Any ideas on a good workflow for this situation? Seems to me more people 
should have the same problem (per customer configuration and styling of 
a generic application)

Thanks in advance for any replies :)

-- 
Regards,

Mike Noordermeer
mike at normi.net