[Top][All Lists]

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

Re: Accidentally merged out code.

From: Andy Bradford
Subject: Re: Accidentally merged out code.
Date: Tue, 27 Mar 2001 22:29:18 -0700

Thus said Larry Jones on Tue, 27 Mar 2001 16:41:12 EST:

> > begin with then it could have removed it.  Would this happen if they
> > were working on different versions of the same file?
> Usually this is caused by someone doing an update while they have a file
> loaded into a text editor and then saving the file over top of the
> merged version (wiping out the merged changes) and then committing it.

That could be what happened, everyone was in a hurry to get the code 
done on time and it is possible that something like this happened.  I 
believe that they may have maintained a separate tree and then copied
over the files into the CVS tree or something strange like that.  I 
just want to make sure that it isn't CVS doing something wrong.  (Which 
I believe it isn't).

[-----------[system uptime]--------------------------------------------]
 10:29pm  up 41 days, 22:31,  6 users,  load average: 1.08, 1.18, 1.14

reply via email to

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