vendor branch

[Fu Ming]

Hi,

 

I have a situation I would like to suggestions.

 

I have a vendor branch in my cvs tree with vendor branch revision 1.1.1.1 1.1.1.2

we made some change to revision 1.1.1.2, so the revision number in our HEAD is 1.2

now I imported a new release of the vendor code, so the vendor branch increased to 1.1.1.3, and because

the new version, those changes we made to 1.1.1.2 and 1.2 are not needed any more.

 

I want to bring the HEAD to revision 1.1.1.3. I can think of the following ways:

 

1. commit a copy of 1.1.1.3 to the HEAD, and it will become revision 1.3. (problem, I will have to do manual merge when 1.1.1.4 comes)

2. delete revision 1.2 and lost the old history of the source three.

 

Is there a better way to do this?

 

Thanks

Ming

============================  
   Ming Fu
   Borderware Technologies, Inc.
   http://www.borderware.com
   address@hidden
   (905)804-1855 Ext 229

Ming Fu.vcf
Description: Vcard