Re: Question on disabling automatic merges

2001-01-25 Thread Larry Jones
Teala Spitzbarth writes: > > Is there anyway to disable the automatic merge on checkin under CVS? There is no automatic merge on checkin -- if a developer tries to commit an out-of-date file, they get an error message telling them to do an update first. It's the update that does the automatic m

Re: Question on disabling automatic merges

2001-01-25 Thread Rex_Jolliff
/RWDOE) Subject: Question on disabling automatic merges Federal Record Status Not Determined Hi

Re: Question on disabling automatic merges

2001-01-24 Thread Stephen Rasku
Tealla Spitzbarth writes: >Hi Folks, > >Is there anyway to disable the automatic merge on checkin under CVS? >I.e. to force that if a developer tries to checkin a file from a working >copy that is outdated - they get an error message? > CVS will currently generate an "Up-to-date check" error me

Question on disabling automatic merges

2001-01-24 Thread Teala Spitzbarth
Hi Folks, Is there anyway to disable the automatic merge on checkin under CVS? I.e. to force that if a developer tries to checkin a file from a working copy that is outdated - they get an error message? I can see that if you admin files with the -m option, it will be disabled, but this requires