From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-1?Q?Vincent_Bela=EFche?= Newsgroups: gmane.emacs.devel Subject: RE: Addition of SES local printer functions. Date: Thu, 02 Jan 2014 22:11:07 +0100 Message-ID: <80bnzuqec4.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1388697346 26094 80.91.229.3 (2 Jan 2014 21:15:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Jan 2014 21:15:46 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 02 22:15:52 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VypcO-0005Dw-1t for ged-emacs-devel@m.gmane.org; Thu, 02 Jan 2014 22:15:52 +0100 Original-Received: from localhost ([::1]:47046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypcN-0003Ew-Jv for ged-emacs-devel@m.gmane.org; Thu, 02 Jan 2014 16:15:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypcG-0003AH-Hf for emacs-devel@gnu.org; Thu, 02 Jan 2014 16:15:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VypcA-0003Ng-Om for emacs-devel@gnu.org; Thu, 02 Jan 2014 16:15:44 -0500 Original-Received: from smtp02.smtpout.orange.fr ([80.12.242.124]:54503 helo=smtp.smtpout.orange.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypcA-0003N4-IR for emacs-devel@gnu.org; Thu, 02 Jan 2014 16:15:38 -0500 Original-Received: from CHOUNEK ([90.32.163.58]) by mwinf5d56 with ME id 99Fc1n00L1FuVCy039FddR; Thu, 02 Jan 2014 22:15:37 +0100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.12.242.124 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:167084 Archived-At: Ok! My commit has gone through! Thank you Eli and all. Note that I had to run `bzr resolve --take-other' twice, once with the info directory and once without it. FYI, I had also to place my change not in last position in the doc/misc/ChangeLog file otherwise dates would have been out of sequence --- probably this is an effect of the time difference. Here in France it is still the 2nd of January, while in some other place it is already the 3rd. Happy new year 2014! Vincent. > Date: Thu, 2 Jan 2014 23:01:43 +0200 > From: eliz@gnu.org > Subject: Re: Addition of SES local printer functions. > To: vincent.b.1@hotmail.fr > CC: monnier@iro.umontreal.ca; emacs-devel@gnu.org > > > From: Vincent Bela=EFche > > Date: Thu, 02 Jan 2014 21:23:55 +0100 > > Cc: Stefan Monnier , emacs-devel@gnu.org > > > > conflicts: > > Conflict: can't delete info because it is not empty. Not deleting. > > That's because the info directory was deleted from the repository. > Remove all of its contents by shell commands, then type this: > > bzr resolve --take-other > >