Howto solve this in cvs ?

[Gerhard Ahuis]

Hi cvs folks,

I have the following situation:

A vendor branch called Vendor on which I import all updates from the vendor.
After the import is done I merge in all our local changes. A very common
situation I think.

The vendor is working with its own version numbers. The table next lists the
versions released:

1.0
1.1
1.2
1.3
2.0
2.1
2.2
2.3
3.0

The vendor did a complete architecture change and cleanup between 2.x and 3.x.
So I created a branch called MySoftBasedOn_2x on which further developments
on the 2.x software are done.
The main branch is based on 3.x software. Now the vendor is starting to 
supply service packs (ugh) for 2.x.
I cannot import this on the Vendor branch because the 2.x sources must not 
show up on the main branch.
What is the best way to import the 2.x service packs and let them showup on the
MySoftBasedOn_2x branch ?

I hope my story is clear..

Thanks,

Gerhard.

-- 
Gerhard Ahuis
  address@hidden

Unsolicited advertisements subject to $1000 consulting fee.