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: Fri, 03 Jan 2014 12:34:24 +0200 Message-ID: <8361q1xsjz.fsf@gnu.org> References: <801u0qq8w9.fsf@gmail.com> <83ha9lxzv1.fsf@gnu.org> 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 1388745345 15315 80.91.229.3 (3 Jan 2014 10:35:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jan 2014 10:35:45 +0000 (UTC) Cc: 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 Fri Jan 03 11:35:50 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 1Vz26Y-0006dn-1x for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 11:35:50 +0100 Original-Received: from localhost ([::1]:49094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz26X-0004iu-Hp for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 05:35:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz25R-0003dl-7C for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:34:46 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vz25I-00027w-RB for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:34:41 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:44407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz25I-00027l-Id for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:34:32 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MYT00200M6TEC00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 03 Jan 2014 12:34:25 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MYT002WRMPBAQ70@a-mtaout22.012.net.il>; Fri, 03 Jan 2014 12:34:23 +0200 (IST) In-reply-to: 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:167145 Archived-At: > From: Vincent Bela=EFche > CC: emacs-devel > Date: Fri, 3 Jan 2014 10:40:35 +0100 >=20 > I did bzr merge -r 115841..115824 . I said to use "-r N..N-1", so you should have done this instead: bzr merge -r 115841..115840 . > So there seemed to be far more files implied than the 4 which I hav= e modified. For that reason I did not do the commit. Should I ?=20 No, of course not. Instead, revert to the previous state: bzr revert then invoke the correct merge command as shown above. > Maybe the reason is that I did two commits in a row to apply the ch= ange. Then revert them one by one. Like this: bzr merge -r 115838..115837 bzr ci -m "Reverted revision 115838." bzr merge -r 115841..115840 bzr ci -m "Reverted revision 115841."