Re: Build Emacs from CVS

[Stefan Monnier]

> In the past, I consistently ran into conflicts.  So now I always
> remove them before updating.  I evaluate this expression:
> 
>     (progn
>      (cd "/usr/local/src/emacs/")
>      (shell-command "rm /usr/local/src/emacs/lisp/cus-load.el" nil nil)
>      (shell-command "rm /usr/local/src/emacs/lisp/loaddefs.el" nil nil)
>      (cvs-update "/usr/local/src/emacs/" nil))
> 
> I don't know whether removing the files from the source CVS will make
> more trouble than leaving them.  If they are left in, then it would
> help to mention the possibility of removing them before updating.

What I currently recommend is:

        mv lisp/loaddefs.el lisp/foo
        cvs rm lisp/loaddefs.el
        mv lisp/foo lisp/loaddefs.el

and then update the file every once in a while with

        (cd lisp; make autoloads)

you can also `cvs rm lisp/cus-load.el lisp/finder-inf.el' and then
use (cd lisp; make updates) to update all three files.

But be careful not to `cvs commit' since you'd then remove the
files from the repository.


        Stefan