Re: Reintegrate woes

2012-03-19 Thread Stefan Sperling
On Mon, Mar 19, 2012 at 03:26:37PM +, Tennebø Frode wrote: > We have been working for a long time (almost a year) on two products in > paralell. One is a maintenance product, i.e. general bug fixes and very > little new features, called "base" and is effectively trunk. The other is a > "ne

Reintegrate woes

2012-03-19 Thread Tennebø Frode
We have been working for a long time (almost a year) on two products in paralell. One is a maintenance product, i.e. general bug fixes and very little new features, called "base" and is effectively trunk. The other is a "new and improved" with all the latest bells and whistles, and is handled