Hi,

as the subject says: In a branch, I create some subdirectories and files
and add them to the branch. Later I get trouble when merging.
I read some documentation and FAQs, but I'm not clear about the
answers I get there. Sometimes it seems to be a problem, sometimes
not so much.
I've tried out several ways and one problem seems to be that cvs
commands don't recurse into the new subdirs after reverting to the
trunk.
If I create and add an empty subdir hierarchy (of course, the same
as on the branch) to the trunk and then do the merge, it seems to work.

Can someone state that that kind of merge I describe is possible
and in which way? I use cvs 1.10

Thanks
-- 
 iXpoint Informationssysteme GmbH #
           Daimlerstr. 3          # Harald Kucharek
          76275 Ettlingen         # [EMAIL PROTECTED]
    Tel/Fax +49 7243 3775-0/77    # www.ixpoint.de

Reply via email to