[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Getting new directories on trunk-to-branch merge.
From: |
Derek Robert Price |
Subject: |
Re: Getting new directories on trunk-to-branch merge. |
Date: |
Thu, 01 Aug 2002 17:57:56 -0400 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.0) Gecko/20020606 |
James Hughes wrote:
Hi,
If I'm doing a merge, say, from trunk to branch, and new directories
have been created on the trunk since the branch was made, is there a
way to get those directories on the branch as well? I've tried "cvs up
-d -j HEAD", but that didn't work; this implies to me that I have to
re-add and re-commit the directories in order for branch and trunk to
align. Is this correct?
Does `cvs -f up -djHEAD' work?
Derek
--
*8^)
Email: address@hidden
Public key available from www.keyserver.net - Key ID 5ECF1609
Fingerprint 511D DCD9 04CE 48A9 CC07 A421 BFBF 5CC2 56A6 AB0E
Get CVS support at http://ximbiot.com
--
I will not sell school property.
I will not sell school property.
I will not sell school property...
- Bart Simpson on chalkboard, _The Simpsons_