info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Question on disabling automatic merges


From: Stephen Rasku
Subject: Re: Question on disabling automatic merges
Date: Wed, 24 Jan 2001 17:19:04 -0800 (PST)

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 message if you 
attempt to check in and your source is not up to date.  If you do "cvs 
update", it will merge your changes with the latest version in the 
repository and the developer can check in.  Is that what you want?

-- 
Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:    http://www.tgivan.com/
TGI Technologies                        http://www.pop-star.net/




reply via email to

[Prev in Thread] Current Thread [Next in Thread]