Re: Compilation fails

[Peter Dyballa]

Am 12.08.2005 um 21:55 schrieb Luc Teirlinck:

> These look like CVS conflict markers.  You more than probably had a
> conflict during merge when you updated your CVS.  You have to resolve
> such conflicts before proceeding with bootstrapping.

I was just invoking

        cvs -z3 -d:ext:address@hidden:/cvsroot/emacs update emacs

Shouldn't this simply copy the new file over the old? I helped myself 
in deleting xterm.el and re-invoking cvs update -- tomorrow we'll see 
whether it had worked!

--
Greetings

  Pete

When in doubt, use brute force.
                -- Ken Thompson