From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Re: Conflicts in rmail.el Date: Wed, 16 Nov 2011 08:25:37 +0100 Message-ID: <87k470fs0e.fsf@gmail.com> References: <87k4712lwk.fsf@gmail.com> <834ny5dtcd.fsf@gnu.org> <877h312go4.fsf@gmail.com> <831ut8ene3.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1321428367 1770 80.91.229.12 (16 Nov 2011 07:26:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 16 Nov 2011 07:26:07 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 16 08:26:03 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RQZsf-000798-HG for ged-emacs-devel@m.gmane.org; Wed, 16 Nov 2011 08:26:01 +0100 Original-Received: from localhost ([::1]:50470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQZsf-0004GL-29 for ged-emacs-devel@m.gmane.org; Wed, 16 Nov 2011 02:26:01 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:44487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQZsZ-0004Ff-Ld for emacs-devel@gnu.org; Wed, 16 Nov 2011 02:25:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQZsV-0005Xh-E6 for emacs-devel@gnu.org; Wed, 16 Nov 2011 02:25:55 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:36031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQZsV-0005XO-6A for emacs-devel@gnu.org; Wed, 16 Nov 2011 02:25:51 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RQZsT-00074Y-G0 for emacs-devel@gnu.org; Wed, 16 Nov 2011 08:25:49 +0100 Original-Received: from 56.78.88.79.rev.sfr.net ([79.88.78.56]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 16 Nov 2011 08:25:49 +0100 Original-Received: from thierry.volpiatto by 56.78.88.79.rev.sfr.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 16 Nov 2011 08:25:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 56.78.88.79.rev.sfr.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) Cancel-Lock: sha1:ie9uEYlyWoBgdY8g4Q3q1ESeXko= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 80.91.229.12 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:146052 Archived-At: Eli Zaretskii writes: >> From: Thierry Volpiatto >> Cc: Eli Zaretskii , emacs-devel@gnu.org >> Date: Tue, 15 Nov 2011 22:56:43 +0100 >> >> Stefan Monnier writes: >> >> >>> could someone fix existings conflicts in rmail.el? >> >> Just "bzr revert" and move on. >> > >> > Well, "bzr revert" throws away all the changes you may have, so it's not >> > necessarily a good idea. But yes: those conflict are resolved by >> > choosing any of the three options (and I really mean any: it shouldn't >> > matter much which one you choose). >> I have no personal changes there, but bzr revert have now reverted two >> files: >> >> M lisp/emacs-lisp/eieio.el >> M lisp/mail/rmail.el > > Both for the same reasons: autoloads written in those files. > > If you care about that (there's no reason to), run "make autoloads" in > the lisp/ subdirectory after reverting. No i don't care, thanks for explanation. -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997