[cvsnt] Re: Merge new folder branch to trunk

[Chris Morris]

Chris Morris wrote:
> 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.


Apparently, the -d switch is required to make this work:

     cvs update -d -j MY_BRANCH


The -d switch does not seem to be required in normal cvs (on *nix, for 
example), and wasn't required when I tried this in an older version of 
cvsnt (1.11).

-- 
Chris
http://clabs.org