CVS MERGE PROBLEMS.

[wangj]

Hello all,

I encountered this MERGING problem in CVS.

After BranchA was off from MAIN trunk, people created new files as well new
directories in BRANCHA but not in main. When I issued the merge, CVS
successfully added the new files in existing directories of BRANCHA but
failed to add new directories and files in BRANCHA.
cvs -q update -j LASTMERGE -J TMP_MERGE_TAG module
(TMP_MERGE_TAG simply pointed to the tip of BRANCHA)

And people checked some files both into MAIN and BRANCHA, and made changes
on BRANCHA, but CVS refused to merge the changes.

cvs server: file resource/js/homepage.js exists, but has been added in
revision TMP_MERGE_TAG
cvs server: file resource/js/rollover.js exists, but has been added in
revision TMP_MERGE_TAG

Thanks for any input.

cheers
George