From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Conflicts in rmail.el Date: Wed, 16 Nov 2011 05:50:44 +0200 Message-ID: <831ut8ene3.fsf@gnu.org> References: <87k4712lwk.fsf@gmail.com> <834ny5dtcd.fsf@gnu.org> <877h312go4.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1321415576 32480 80.91.229.12 (16 Nov 2011 03:52:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 16 Nov 2011 03:52:56 +0000 (UTC) Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Thierry Volpiatto Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 16 04:52:52 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 1RQWYL-0003bE-1F for ged-emacs-devel@m.gmane.org; Wed, 16 Nov 2011 04:52:49 +0100 Original-Received: from localhost ([::1]:36974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQWYK-0003Oz-K9 for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 22:52:48 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:56280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQWYF-0003Ou-In for emacs-devel@gnu.org; Tue, 15 Nov 2011 22:52:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQWYB-0007r2-C7 for emacs-devel@gnu.org; Tue, 15 Nov 2011 22:52:43 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:33990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQWYB-0007qx-5h for emacs-devel@gnu.org; Tue, 15 Nov 2011 22:52:39 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0LUQ00900ILDGG00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Wed, 16 Nov 2011 05:52:38 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.184.15]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LUQ009C2IROCA60@a-mtaout23.012.net.il>; Wed, 16 Nov 2011 05:52:38 +0200 (IST) In-reply-to: <877h312go4.fsf@gmail.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.175 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:146050 Archived-At: > 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.