|Date:||Fri, 17 Jan 2003 16:38:37 -0500|
I have a situation I would like to suggestions.
I have a vendor branch in my cvs tree with vendor branch revision 184.108.40.206 220.127.116.11
we made some change to revision 18.104.22.168, 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 22.214.171.124, and because
the new version, those changes we made to 126.96.36.199 and 1.2 are not needed any more.
I want to bring the HEAD to revision 188.8.131.52. I can think of the following ways:
1. commit a copy of 184.108.40.206 to the HEAD, and it will become revision 1.3. (problem, I will have to do manual merge when 220.127.116.11 comes)
2. delete revision 1.2 and lost the old history of the source three.
Is there a better way to do this?
|[Prev in Thread]||Current Thread||[Next in Thread]|