Terminator wrote: > Thanks for the information. The directory is empty in the trunk. So i > guess something went wrong when merging from rel-1-branch to trunk. > What is the correct way to fix this. Sould i copy the directory from > rel-1-branch to rel-2-branch and do merge it to the trunk from rel-2- > branch. Appreciate your help.
Your merge probably went fine. CVS does not really know or care about directories except as containers for controlled items, or components on a path to some controlled item. A controlled item is a file, never a directory. Empty directories tend to disappear from your workspace, for instance with the idiomatic use of "cvs update -P". Put a dummy file named ".PRECIOUS" or something into the otherwise empty directory to make it stay in your workspace. Or teach your build system to create empty directories as required. -- Michael Diers | elego Software Solutions GmbH
signature.asc
Description: OpenPGP digital signature
