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: Tue, 15 Nov 2011 22:56:43 +0100 Message-ID: <877h312go4.fsf@gmail.com> References: <87k4712lwk.fsf@gmail.com> <834ny5dtcd.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1321394225 321 80.91.229.12 (15 Nov 2011 21:57:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 15 Nov 2011 21:57:05 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 15 22:57:01 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 1RQR00-00064f-Q9 for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 22:57:00 +0100 Original-Received: from localhost ([::1]:43623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQR00-0003GP-DT for ged-emacs-devel@m.gmane.org; Tue, 15 Nov 2011 16:57:00 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:52059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQzt-0003G4-Qj for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:56:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQQzp-0001Ae-CJ for emacs-devel@gnu.org; Tue, 15 Nov 2011 16:56:53 -0500 Original-Received: from mail-bw0-f41.google.com ([209.85.214.41]:45147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQQzp-0001AC-7O; Tue, 15 Nov 2011 16:56:49 -0500 Original-Received: by bke17 with SMTP id 17so7874679bke.0 for ; Tue, 15 Nov 2011 13:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=J4FL87n0KVA2YYCfuqEOFUm4BLMWLJDtWXmdRlvlRtc=; b=xgVXDC7XWqFMOy9U3XmgIJF1mBlNlwJsLutySH0Nnzvg0AeR8ea/Ik1uuxBdmRI6cM x9lRdX0JOYLVU18z+/JCvtMNKYUtd0qCf3bDyvFZYfkejBz02YMr0wL3NcObTalgNYBp 27aKQoiWiVjZngBBOe7dLJ2CAyGT+NIxYTZ/g= Original-Received: by 10.204.152.74 with SMTP id f10mr26028005bkw.76.1321394208156; Tue, 15 Nov 2011 13:56:48 -0800 (PST) Original-Received: from thierry-MM061 (56.78.88.79.rev.sfr.net. [79.88.78.56]) by mx.google.com with ESMTPS id j4sm939762fae.3.2011.11.15.13.56.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 13:56:47 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Tue, 15 Nov 2011 16:46:09 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.41 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:146048 Archived-At: 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 -- Thierry Get my Gnupg key: gpg --keyserver pgp.mit.edu --recv-keys 59F29997