Re: [Libphidget-devel] More on indent
Status: Alpha
Brought to you by:
jstrohm
|
From: Jack S. <js...@ja...> - 2002-09-11 03:26:28
|
On Tue, 2002-09-10 at 22:18, Vadim Tkachenko wrote:
> According to Jack Strohm:
>
> > > > I was just commenting, that if it would be bad if any developer deleted
> > > > his copy of the files (see problem you fixed above) right before he
> > > > checked it in.
> > >
> > > That's what the CVS rollbacks are for ;)
> >
> > What are CVS rollbacks?
>
> If the code was screwed up, it's possible to make a rollback. Moreover, it's
> possible to roll back not only the last change, but any arbitrary change (or
> span of changes) in the past.
>
> Suppose, you're at revision 1.111, and figure out there was a problem with
> the change between 1.12 and 1.13. This is what you do then:
>
> cvs update -j 1.13 -j 1.12 FileName
>
> And the file in the working directory will contain the current file, less
> changes from 1.12 to 1.13.
>
> Of course, this is a simplification - there may be conflicts (as in 'CVS
> conflicts'), but this is the big picture.
Well, what I was saying was the following scenario . . .
cvs checkout . . .
make indent-local
<edit the code>
<everything works, let's commit our changes>
make indent <----- CRAP a bug delete all the code
hmmm . . . crap, can't commit, got to redo all the previous changes
I just finished writing.
does that make sense?
>
> > > Duck!
> >
> > What's with this Duck thing?
>
> "Duck" is the action you're supposed to execute when something heavy is
> flying your way ;)
ahhhh . . .
|