[cvsnt] Merge new folder branch to trunk

Harrison, Andrew andy.harrison at anite.com
Wed May 12 10:14:03 BST 2004


> From: Chris Morris [mailto:cvsnt at clabs.org]
> 
> I branched, added a new _folder_ with files (not just a 
> file), and doing an:
> 
>    cvs update -A
>    cvs update -j MY_BRANCH
> 
> ... didn't merge in the new folder to the trunk.

You need to specify the -d option on the update -j. This will create new
directories that exist on the server but not on your local disk. It's so
easy to forget to do this even when you know you need to. I often think it
would be better if this option was implicit in an update and you had to
specify something to turn it off, but it's too late to change the interface
now.

Hope that helps,
Andy

--
Andy Harrison - Platform Software Engineer 
Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK
"No matter how bad things seem... 
...nothing could be worse than being used as a towel rail." - A.A. Milne
Please note that my email domain has changed from @anitetelecoms.com to
@anite.com 
Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue,
Slough, Berkshire SL1 4PF, United Kingdom 





Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.


More information about the cvsnt mailing list