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.
Torsten Martinsen wrote: > keith d. zimmerman wrote: > >> Hi, >> >> I'm running cvsnt and tortoise cvs. When I do a merge command (and >> type in commit ids) from tortoise, it runs the following: >> >> In C:\builds\current: "C:\Program Files\TortoiseCVS\cvs.exe" "-q" "-x" >> "update" "-j" "@<171041e2d90b0745" "-j" "@171041e2d90b0745" "." >> CVSROOT=:sspi:dev-server:/ewcode >> >> This results not only in the changes merging as expected, but it also >> updates any *other* files that have been changed since my last update. >> It's not a big deal, but it can be annoying... > > > Note that the command specifies ".", i.e. the current directory. So > CVSNT does the correct thing. Did you select individual files, or the > entire directory? > > -Torsten > i selected the entire directory... The commit id refered to changes in approx. 8 different files. It was my understanding of the "update -j -j" syntax that only the changes between those two would be applied, and not a full update....