Re: [avr port] documentation patch

[Jan-Benedict Glaw <jbglaw at lug-owl dot de>]

On Mon, 2006-05-29 21:35:58 +0400, Denis Chertykov <denisc@overta.ru> wrote:
> Nick Clifton <nickc@redhat.com> writes:
> > > 06 May 2006 I have posted the documentation patch for AVR target.
> > 
> > Oops - sorry - my bad.
> > 
> > > http://sourceware.org/ml/binutils/2006-05/msg00127.html
> > > Can anybody approve or reject it ?
> > 
> > Approved - please apply.
> 
> I can't commit the changes.
> 
> CVS/Root:
> denisc@sources.redhat.com:/cvs/src
> 
> ----------- cvs command and output -------------------
> EDITOR=emacsclient cvs -z9 commit ../ChangeLog Makefile.am all.texi \
> as.texinfo c-avr.texi 
> Enter passphrase for RSA key '/root/.ssh/identity': denisc
> 
> Waiting for Emacs...Done
> cvs commit: Up-to-date check failed for `Makefile.am'
> cvs commit: Up-to-date check failed for `all.texi'
> cvs commit: Up-to-date check failed for `as.texinfo'
> cvs [commit aborted]: correct above errors first!
> cvs commit: saving log message in /tmp/cvsOvEvUg
> ----------------------------------------------------------

The three files mentioned above were changed by somebody else in the
time between you checked them out and now. So you first need to run
"cvs update" for these, check that all changes done by that other
person won't conflict with your changes. After that, CVS will allow
you to commit. (If it had committed your files, the changes made by
somebody else were lost.)

MfG, JBG

-- 
Jan-Benedict Glaw       jbglaw@lug-owl.de    . +49-172-7608481             _ O _
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Zensur | Gegen Krieg  _ _ O
 fÃr einen Freien Staat voll Freier BÃrger"  | im Internet! |   im Irak!   O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));

Attachment: signature.asc
Description: Digital signature