[cvsnt] Re: cvs update overwrites changes
vo.david at gmail.com
Fri Feb 18 21:36:48 GMT 2005
Thanks for your reply.
They are having problems with VB text files. I understand the binary
limitation. The messages just show a <M filename> message. When the
developers open the updated file, they have the newest revision
checked out but all of their local changes will be lost. Are there any
reasons why this is happening?
On Fri, 18 Feb 2005 07:18:18 +0100, Bo Berglund <bo.berglund at telia.com> wrote:
> On Thu, 17 Feb 2005 17:52:12 -0800, David Vo <vo.david at gmail.com>
> >1. FileA is edited by, say, 3 people.
> >2. A is comitted by person1 and person2 updates it using cvs update
> >FileA which overwrites the changes made by person2 with the changes
> >made by person1. And so on.
> >3. Currently, the temporary solution is to exclusively lock the file
> >to prevent code loss.
> If the file is binary this is exactly what is supposed to happen.
> However the modified file that was overwritten is actually saved first
> under a new name (same as the original plus revision info).
> This is also displayed to the user while the update runs, just read
> the messages and you will see what happens.
> It is not possible to merge the contents of binary files so this is
> the only way to handle this situation.
> (Bo Berglund, developer in Sweden)
> cvsnt mailing list
> cvsnt at cvsnt.org
More information about the cvsnt