[cvsnt] Re: Subdirectories and CVS merge problem

Oliver Giesen ogware at gmx.net
Wed May 28 14:01:06 BST 2003


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


> I was just merging a branch back into the main development line and
> noticed that my new subdirectories that I made in the branch are not
> merged into the main branch (they just don't appear at all after the
> merge, allthough the changed/added files in directories that already
> existed ARE merged in correctly). Is that normal? How can I force these
> directories (and the files in there) to be merged?

Did you merge using Update or Checkout? Checkout should work AFAICT. Update
might require the -d option but I'm not sure on that one.

Hope this helps.

Oliver
---- ------------------
JID: ogiesen at jabber.org
ICQ: 18777742
      (http://wwp.icq.com/18777742)



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook