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: Addition of SES local printer functions. Date: Thu, 02 Jan 2014 23:01:43 +0200 Message-ID: <83mwjexfm0.fsf@gnu.org> References: <80k3eiqgis.fsf@gmail.com> Reply-To: Eli Zaretskii 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 1388696554 17366 80.91.229.3 (2 Jan 2014 21:02:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Jan 2014 21:02:34 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Vincent =?iso-8859-1?Q?Bela=EFche?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 02 22:02:40 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 1VypPa-0005y4-HJ for ged-emacs-devel@m.gmane.org; Thu, 02 Jan 2014 22:02:38 +0100 Original-Received: from localhost ([::1]:46990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypPa-0006rr-4N for ged-emacs-devel@m.gmane.org; Thu, 02 Jan 2014 16:02:38 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypPS-0006pz-Hw for emacs-devel@gnu.org; Thu, 02 Jan 2014 16:02:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VypPN-00086s-Pr for emacs-devel@gnu.org; Thu, 02 Jan 2014 16:02:30 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:41078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VypPN-00086d-II; Thu, 02 Jan 2014 16:02:25 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MYS00J00L0AVW00@a-mtaout22.012.net.il>; Thu, 02 Jan 2014 23:01:43 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MYS00J6RL2V3DH0@a-mtaout22.012.net.il>; Thu, 02 Jan 2014 23:01:43 +0200 (IST) In-reply-to: <80k3eiqgis.fsf@gmail.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:167079 Archived-At: > From: Vincent Bela=EFche > Date: Thu, 02 Jan 2014 21:23:55 +0100 > Cc: Stefan Monnier , emacs-devel@gnu.org >=20 > conflicts: > Conflict: can't delete info because it is not empty. Not deletin= g. 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