need advice on merges

Hi,

I am making a number of local enchancements to a upstream source. All
of the enchancements are orthogonal to each other so they go into
different branches, for ease of management and focus. Also, I've a
"full-flavoured" branch that merges in all the local enchancements
into one. None of these enchancements will be going into upstream as
they're either too specialised or hacky.

My question is how should I manage changes from upstream ? If I merge
the changes from upstream into all of the branches, then when it comes
to updating the full-flavoured branch there would be lots of
conflicts.

Any suggestions or recommendations on how I should manage the branches ?

Thanks.

-- 
//ng/mark
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org