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: Fri, 03 Jan 2014 13:44:50 +0100 Message-ID: <80sit5p73x.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 1388753378 4924 80.91.229.3 (3 Jan 2014 12:49:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jan 2014 12:49:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 03 13:49:43 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 1Vz4C6-0005nH-TX for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 13:49:43 +0100 Original-Received: from localhost ([::1]:49523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz4C6-0001Lw-Dy for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 07:49:42 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz4By-0001G8-H6 for emacs-devel@gnu.org; Fri, 03 Jan 2014 07:49:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vz4Bo-00061y-HV for emacs-devel@gnu.org; Fri, 03 Jan 2014 07:49:34 -0500 Original-Received: from smtp01.smtpout.orange.fr ([80.12.242.123]:16423 helo=smtp.smtpout.orange.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz4Bo-00061h-AL for emacs-devel@gnu.org; Fri, 03 Jan 2014 07:49:24 -0500 Original-Received: from CHOUNEK ([90.32.163.58]) by mwinf5d01 with ME id 9QpM1n00B1FuVCy03QpM2K; Fri, 03 Jan 2014 13:49:22 +0100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.12.242.123 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:167154 Archived-At: Shouldn't that be in that order: bzr merge -r 115841..115840 bzr ci -m "Reverted revision 115841." bzr merge -r 115838..115837 bzr ci -m "Reverted revision 115838." i.e revert first 115841 and second 115838 ? Vincent. > Date: Fri, 3 Jan 2014 12:34:24 +0200 > From: eliz@gnu.org > Subject: Re: Addition of SES local printer functions. > To: vincent.b.1@hotmail.fr > CC: emacs-devel@gnu.org > > > From: Vincent Bela=EFche > > CC: emacs-devel > > Date: Fri, 3 Jan 2014 10:40:35 +0100 > > > > 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 have mo= dified. For that reason I did not do the commit. Should I ? > > 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 change. > > 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." > >