I've been unable to merge in changes between my code and two different
"vendor" versions. Here's the scenario
A while ago I got the public code, and did a cvs import.
Then I made some changes to it.
Today I did a commit, and then release.
I got a more recent version of the vendor code, and did another
import:
cvs import Zope/Poll Zope v0_7_1
As expected, I got a message telling me to merge, but the merge
command failed:
----------------------------------------------
2 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jZope:yesterday -jZope Zope/Poll
ross@wheat:/usr/local/src/Zope/lib/python/Products/Poll$ cd ../../..
ross@wheat:/usr/local/src/Zope/lib$ cd ..
ross@wheat:/usr/local/src/Zope$ cvs co -jZope:yesterday -jZope Zope/Poll
cvs [checkout aborted]: only two -j options can be specified
-------------------------------------------
1) Can anyone tell me what the problem is (and how to fix it)?
2) How do I find the vendor/tag info from my first import; I've
forgotten the details and they may differ from what I did this time.
Thanks.
