Re: Accidentally merged out code.

[Alexander Kamilewicz]

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