Re: Accidentally merged out code.
"Alexander Kamilewicz" <[EMAIL PROTECTED]> writes: > Andy Bradford wrote: > > > > Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST: > > > > > > 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. > > > > > > LOL!!! That's pretty clever. I hope my developers don't find out about > > > that > > > > While it might be clever, it is certainly a nightmare when trying to > > figure out why their code disappeared. Then, try explaining to them > > that this is not the correct way to use it. :-) > > That's why I've got this large baseball bat here :) And fortunately most text editors (at least the ones I use, ie emacs and MS Visual Studio) are smart enough to notice when this happens, and at least give a warning before overwriting the updated copy. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Andy Bradford wrote: > > Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST: > > > > 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. > > > > LOL!!! That's pretty clever. I hope my developers don't find out about > > that > > While it might be clever, it is certainly a nightmare when trying to > figure out why their code disappeared. Then, try explaining to them > that this is not the correct way to use it. :-) That's why I've got this large baseball bat here :) -- This message is intended only for the use of the addressee(s) named herein. The information contained in this message is confidential and may constitute proprietary or inside information. Unauthorized review, dissemination, distribution, copying or other use of this message, including all attachments, is strictly prohibited and may be unlawful. If you have received this message in error, please notify us immediately by return e-mail and destroy this message and all copies thereof, including all attachments. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Thus said "Alexander Kamilewicz" on Wed, 28 Mar 2001 10:24:34 CST: > > 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. > > LOL!!! That's pretty clever. I hope my developers don't find out about > that While it might be clever, it is certainly a nightmare when trying to figure out why their code disappeared. Then, try explaining to them that this is not the correct way to use it. :-) -- [---[system uptime]] 7:25pm up 42 days, 19:27, 4 users, load average: 1.10, 1.21, 1.10 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
On Wed, Mar 28, 2001 at 01:43:57AM -0700, Andy Bradford wrote: > trying to convince others that have never used [CVS] before, that suddenly > attribute all their problems to it, is difficult and I need reasons. I > can't just simply say ``you screwed up.'' I know it's due to human > error, but need to make others see this light. :-) "cvs history" can be useful. The only time I ever used it was to prove user error in a case something like this. I can't remember the details, though; sorry. -- | | /\ |-_|/ > Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED] | | / With sufficient thrust, pigs fly just fine. However, this is not necessarily a good idea. - RFC 1925 (quoting an unnamed source) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Larry Jones wrote: > > Andy Bradford writes: > > > > I'm not sure how to describe this situation, but I'll try. Two people > > had copies of the repository (I believe the same). The first person > > made changes and committed them. The second person also made changes > > and committed them. Then, a third person that supposedly had the same > > tree, checked in code and it caused the changes made by person one be > > ``merged out''. I'm not entirely certain how this could happen since > > each did a ``cvs up'' before committing. Person three didn't remove any > > code from the files, however, I guess if the code wasn't in there to > > 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. LOL!!! That's pretty clever. I hope my developers don't find out about that Alex ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Harald Kucharek writes: > > Let me put it this way, Mr. Bradford. The CVS system is the > most reliable software ever made. No CVS server has ever made > a mistake or distorted information. They are are all, by any practical > definition of the words, foolproof and incapable of error. I'd feel a lot better about that description if I hadn't just fixed a bug that could potentially lose the most recent revision(s) of a file. (Fortunately, there's a very small window of vulnerability and there haven't been any reports of the problem actually occurring, even though it's been there for years.) -Larry Jones I'm getting disillusioned with these New Years. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Thus said Harald Kucharek on Wed, 28 Mar 2001 09:38:40 +0200: > Well, I don't think there is any question about it. It can > only be attributable to human error. This sort of thing has Oh, you won't get any argument from me here... > Let me put it this way, Mr. Bradford. The CVS system is the > most reliable software ever made. No CVS server has ever made > a mistake or distorted information. They are are all, by any practical > definition of the words, foolproof and incapable of error. Like I said, I have no qualms with anything you said. I personally think CVS is truly one of the greatest pieces of software, however, trying to convince others that have never used it before, that suddenly attribute all their problems to it, is difficult and I need reasons. I can't just simply say ``you screwed up.'' I know it's due to human error, but need to make others see this light. :-) I understand how CVS works for the most part since I have used RCS, diff and friends quite extensively, but haven't ever encountered this situation in my usage (maybe that's because I know how to use it) of CVS. Andy -- [---[system uptime]] 1:43am up 42 days, 1:46, 4 users, load average: 1.06, 1.06, 1.04 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Andy Bradford wrote: > > 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). > > Andy Well, I don't think there is any question about it. It can only be attributable to human error. This sort of thing has cropped up before, and it has always been due to human error. ;-) Sorry, I couldn't resist. It's that year... And, slightly edited: Let me put it this way, Mr. Bradford. The CVS system is the most reliable software ever made. No CVS server has ever made a mistake or distorted information. They are are all, by any practical definition of the words, foolproof and incapable of error. ;-) Have a nice day. Harald -- iXpoint Informationssysteme GmbH # Daimlerstr. 3 # Harald Kucharek 76275 Ettlingen # [EMAIL PROTECTED] Tel/Fax +49 7243 3775-0/77# www.ixpoint.de ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
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). Andy -- [---[system uptime]] 10:29pm up 41 days, 22:31, 6 users, load average: 1.08, 1.18, 1.14 ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Accidentally merged out code.
Andy Bradford writes: > > I'm not sure how to describe this situation, but I'll try. Two people > had copies of the repository (I believe the same). The first person > made changes and committed them. The second person also made changes > and committed them. Then, a third person that supposedly had the same > tree, checked in code and it caused the changes made by person one be > ``merged out''. I'm not entirely certain how this could happen since > each did a ``cvs up'' before committing. Person three didn't remove any > code from the files, however, I guess if the code wasn't in there to > 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. -Larry Jones What's Santa's definition? How good do you have to be to qualify as good? -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Accidentally merged out code.
I'm not sure how to describe this situation, but I'll try. Two people had copies of the repository (I believe the same). The first person made changes and committed them. The second person also made changes and committed them. Then, a third person that supposedly had the same tree, checked in code and it caused the changes made by person one be ``merged out''. I'm not entirely certain how this could happen since each did a ``cvs up'' before committing. Person three didn't remove any code from the files, however, I guess if the code wasn't in there to begin with then it could have removed it. Would this happen if they were working on different versions of the same file? Thanks. Andy ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
