I have read those references and I can't think that there is anything in them that would directly help Jun (if there is a shot at it, I would bet on the book at red-bean.com). Another great reference is the CVS FAQ-O-Matic - but I don't see anything directly relavent. Your best bet is the import section:
http://www.loria.fr/~molli/fom-serve/cache/157.htmlThe FAQ claims that you can merge between any 2 branches (http://www.loria.fr/~molli/fom-serve/cache/10.html) but I have never been able to merge from one branch to another without merging to the trunk and then back out to the second branch. CVS just seems to ignore the changed files when I try it. I think that is the cause of the problem you are having - cvs update -jA -jB just gives you the B files rather than the merge you want.
Please post back to the list if you crack this one. I would love to know how one could do this.
