emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: make bootstrap modifies several *.el files


From: Stefan Monnier
Subject: Re: make bootstrap modifies several *.el files
Date: Fri, 28 Jan 2011 10:09:31 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

>> these files were modified (perhaps because of updating
>> autoloads comments.
>> 
>> lisp/dired.el
>> lisp/emacs-lisp/cl-loaddefs.el
>> lisp/emulation/tpu-edt.el
>> lisp/htmlfontify.el
>> lisp/ibuffer.el
>> lisp/mail/rmail.el
>> lisp/ps-print.el
>> 
>> What should I do with them?  Simply commit them as this?

Yes.

> I did "bzr revert" and Stefan told me that's one
> of several ways to deal with this problem.

This is a different issue: "bzr revert" is/was a way to deal with *merge
conflicts* on those changes, whereas this time we're discussing how to
deal with updates coming from the build itself.


        Stefan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]