RE: New directories when merging branches...

[Mike Shamberger]

Gary,

I had this problem last month.  Make sure you use the -d option when you run
the update command for the merge:

For example:
cvs -q update -d -P -j dev

Mike

-----Original Message-----
From: address@hidden [mailto:address@hidden Behalf Of
Gary Young
Sent: Wednesday, October 18, 2000 2:23 PM
To: address@hidden
Cc: Karen Gnaski (rxfk30)
Subject: New directories when merging branches...


Forwarded by Gary Young:

We have a problem when we merge from 1 branch to another
and new directories exist in the branch we are merging from,
CVS will not create the new directories in the branch
we are merging to (or the main latest for that matter).
If we create the directory and add it in the branch we
are merging to, the new files will get merged from the new
directories in the merge from branch.  This is very tedious.
Is there another way to do this?

I'm using the WinCVS CVSgui for NT.

Thanks.

Karen Gnaski