From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-1?B?VmluY2VudCBCZWxh72NoZQ==?= Newsgroups: gmane.emacs.devel Subject: RE: Addition of SES local printer functions. Date: Fri, 3 Jan 2014 10:40:35 +0100 Message-ID: References: <801u0qq8w9.fsf@gmail.com>,<83ha9lxzv1.fsf@gnu.org> 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 1388743249 24891 80.91.229.3 (3 Jan 2014 10:00:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jan 2014 10:00:49 +0000 (UTC) Cc: emacs-devel To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 03 11:00:57 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 1Vz1Ym-00019k-UM for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 11:00:57 +0100 Original-Received: from localhost ([::1]:48867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1Yj-00067G-Em for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 05:00:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1Yc-000679-Ao for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:00:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vz1YY-0000KA-2Q for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:00:46 -0500 Original-Received: from dub0-omc2-s3.dub0.hotmail.com ([157.55.1.142]:49670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1YT-0000Hr-9i; Fri, 03 Jan 2014 05:00:37 -0500 Original-Received: from DUB109-W51 ([157.55.1.136]) by dub0-omc2-s3.dub0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 3 Jan 2014 01:40:35 -0800 X-TMN: [lGOyfibn04ZPUijvgP7R3MPLLb62lgty] X-Originating-Email: [vincent.b.1@hotmail.fr] Importance: Normal In-Reply-To: <83ha9lxzv1.fsf@gnu.org> X-OriginalArrivalTime: 03 Jan 2014 09:40:35.0442 (UTC) FILETIME=[DA50DD20:01CF0867] X-detected-operating-system: by eggs.gnu.org: Windows XP X-Received-From: 157.55.1.142 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:167135 Archived-At: Hello Eli=2C=0A= =0A= I did bzr merge -r 115841..115824 .=2C but then it has output this:=0A= =0A= =0A= =A0M=A0 admin/ChangeLog=0A= =A0M=A0 admin/admin.el=0A= =A0M=A0 admin/check-doc-strings=0A= =A0M=A0 admin/unidata/unidata-gen.el=0A= =A0M=A0 config.bat=0A= =A0M=A0 configure.ac=0A= =A0M=A0 doc/emacs/emacs-xtra.texi=0A= =A0M=A0 doc/emacs/emacs.texi=0A= =A0M=A0 doc/emacs/maintaining.texi=0A= =A0M=A0 doc/emacs/text.texi=0A= =A0M=A0 doc/lispintro/emacs-lisp-intro.texi=0A= =A0M=A0 doc/lispref/ChangeLog=0A= =A0M=A0 doc/lispref/display.texi=0A= =A0M=A0 doc/lispref/elisp.texi=0A= =A0M=A0 doc/lispref/nonascii.texi=0A= =A0M=A0 doc/lispref/numbers.texi=0A= =A0M=A0 doc/lispref/tips.texi=0A= =A0M=A0 doc/man/ebrowse.1=0A= =A0M=A0 doc/man/emacs.1=0A= =A0M=A0 doc/man/etags.1=0A= =A0M=A0 doc/man/grep-changelog.1=0A= =A0M=A0 doc/misc/ChangeLog=0A= =A0M=A0 doc/misc/Makefile.in=0A= =A0M=A0 doc/misc/ada-mode.texi=0A= =A0M=A0 doc/misc/auth.texi=0A= =A0M=A0 doc/misc/autotype.texi=0A= =A0M=A0 doc/misc/bovine.texi=0A= =A0M=A0 doc/misc/calc.texi=0A= =A0M=A0 doc/misc/cc-mode.texi=0A= =A0M=A0 doc/misc/cl.texi=0A= =A0M=A0 doc/misc/dbus.texi=0A= =A0M=A0 doc/misc/dired-x.texi=0A= =A0M=A0 doc/misc/ebrowse.texi=0A= =A0M=A0 doc/misc/ede.texi=0A= =A0M=A0 doc/misc/ediff.texi=0A= =A0M=A0 doc/misc/edt.texi=0A= =A0M=A0 doc/misc/efaq.texi=0A= =A0M=A0 doc/misc/eieio.texi=0A= =A0M=A0 doc/misc/emacs-gnutls.texi=0A= =A0M=A0 doc/misc/emacs-mime.texi=0A= =A0M=A0 doc/misc/epa.texi=0A= =A0M=A0 doc/misc/erc.texi=0A= =A0M=A0 doc/misc/ert.texi=0A= =A0M=A0 doc/misc/eshell.texi=0A= =A0M=A0 doc/misc/eudc.texi=0A= =A0M=A0 doc/misc/flymake.texi=0A= =A0M=A0 doc/misc/forms.texi=0A= =A0M=A0 doc/misc/gnus-coding.texi=0A= =A0M=A0 doc/misc/gnus-news.el=0A= =A0M=A0 doc/misc/gnus.texi=0A= =A0M=A0 doc/misc/idlwave.texi=0A= =A0M=A0 doc/misc/ido.texi=0A= =A0M=A0 doc/misc/info.texi=0A= =A0M=A0 doc/misc/mairix-el.texi=0A= =A0M=A0 doc/misc/message.texi=0A= =A0M=A0 doc/misc/mh-e.texi=0A= =A0M=A0 doc/misc/newsticker.texi=0A= =A0M=A0 doc/misc/nxml-mode.texi=0A= =A0M=A0 doc/misc/octave-mode.texi=0A= =A0M=A0 doc/misc/org.texi=0A= =A0M=A0 doc/misc/pcl-cvs.texi=0A= =A0M=A0 doc/misc/pgg.texi=0A= =A0M=A0 doc/misc/rcirc.texi=0A= =A0M=A0 doc/misc/reftex.texi=0A= =A0M=A0 doc/misc/remember.texi=0A= =A0M=A0 doc/misc/sasl.texi=0A= =A0M=A0 doc/misc/sc.texi=0A= =A0M=A0 doc/misc/semantic.texi=0A= =A0M=A0 doc/misc/ses.texi=0A= =A0M=A0 doc/misc/sieve.texi=0A= =A0M=A0 doc/misc/smtpmail.texi=0A= =A0M=A0 doc/misc/speedbar.texi=0A= =A0M=A0 doc/misc/srecode.texi=0A= =A0M=A0 doc/misc/texinfo.tex=0A= =A0M=A0 doc/misc/tramp.texi=0A= =A0M=A0 doc/misc/url.texi=0A= =A0M=A0 doc/misc/vip.texi=0A= =A0M=A0 doc/misc/viper.texi=0A= =A0M=A0 doc/misc/widget.texi=0A= =A0M=A0 doc/misc/wisent.texi=0A= =A0M=A0 doc/misc/woman.texi=0A= =A0M=A0 etc/NEWS=0A= =A0M=A0 etc/images/README=0A= =A0M=A0 etc/images/checked.xpm=0A= =A0M=A0 etc/images/gnus/README=0A= =A0M=A0 etc/images/gud/README=0A= =A0M=A0 etc/images/icons/README=0A= =A0M=A0 etc/images/mh-logo.xpm=0A= =A0M=A0 etc/images/splash.xpm=0A= =A0M=A0 etc/images/unchecked.xpm=0A= =A0M=A0 etc/refcards/README=0A= =A0M=A0 etc/refcards/gnus-refcard.tex=0A= =A0M=A0 etc/refcards/ru-refcard.tex=0A= =A0M=A0 etc/tutorials/TUTORIAL.cn=0A= =A0M=A0 etc/tutorials/TUTORIAL.he=0A= =A0M=A0 etc/tutorials/TUTORIAL.nl=0A= =A0M=A0 etc/tutorials/TUTORIAL.ro=0A= =A0M=A0 etc/tutorials/TUTORIAL.sl=0A= =A0M=A0 lib-src/rcs2log=0A= =A0M=A0 lib/getopt_.h=0A= =A0M=A0 lisp/ChangeLog=0A= =A0M=A0 lisp/cedet/semantic/imenu.el=0A= =A0M=A0 lisp/dired-aux.el=0A= =A0M=A0 lisp/mail/rmail.el=0A= =A0M=A0 lisp/mail/rmailmm.el=0A= =A0M=A0 lisp/net/tramp-sh.el=0A= =A0M=A0 lisp/org/ox-html.el=0A= =A0M=A0 lisp/ses.el=0A= =A0M=A0 msdos/README=0A= =A0M=A0 msdos/autogen/Makefile.in=0A= =A0M=A0 msdos/depfiles.bat=0A= =A0M=A0 msdos/sed2v2.inp=0A= =A0M=A0 nt/config.nt=0A= =A0M=A0 nt/configure.bat=0A= =A0M=A0 nt/emacs.rc=0A= =A0M=A0 nt/emacsclient.rc=0A= =A0M=A0 nt/icons/README=0A= =A0M=A0 src/ChangeLog=0A= =A0M=A0 src/bidi.c=0A= =A0M=A0 src/fileio.c=0A= =A0M=A0 src/frame.c=0A= =A0M=A0 src/indent.c=0A= =A0M=A0 src/insdel.c=0A= =A0M=A0 src/lisp.h=0A= =A0M=A0 src/lread.c=0A= =A0M=A0 src/search.c=0A= =A0M=A0 src/w32fns.c=0A= =A0M=A0 src/w32term.c=0A= =A0M=A0 src/window.c=0A= =A0M=A0 src/xdisp.c=0A= =A0M=A0 src/xfns.c=0A= =A0M=A0 src/xterm.c=0A= All changes applied successfully.=0A= =0A= So there seemed to be far more files implied than the 4 which I have modifi= ed. For that reason I did not do the commit. Should I ? =0A= =0A= Maybe the reason is that I did two commits in a row to apply the change.=0A= =0A= I have saved my changes somewhere so no problem if I simply destroy my work= area and pull a new clean one.=0A= =0A= By the way=2C I will subscribe to the announce list=2C that is an excellent= idea=2C reading all the emails on the devel list is simply impossible for = my level of involvement.=0A= =0A= =A0=A0 Vincent.=0A= =0A= ----------------------------------------=0A= > Date: Fri=2C 3 Jan 2014 09:56:34 +0200=0A= > From: eliz@gnu.org=0A= > Subject: Re: Addition of SES local printer functions.=0A= > To: vincent.b.1@hotmail.fr=0A= > CC: emacs-devel@gnu.org=0A= >=0A= >> From: Vincent Bela=EFche =0A= >> Date: Fri=2C 03 Jan 2014 00:08:38 +0100=0A= >> Cc: emacs-devel@gnu.org=0A= >>=0A= >> Please explain me how to "uncommit" the change=2C and I can undo it=2C s= o=0A= >> that the local printers function is introduced later on.=0A= >=0A= > Like this:=0A= >=0A= > bzr merge -r N..N-1 .=0A= > bzr commit -m "Reverted SES changes for local printer functions."=0A= >=0A= > where N is the revision number you committed=2C N-1 is the revision=0A= > number before that. Note all the dots in the first command: they are=0A= > important.=0A= >=0A= > (You may wish to save your changes in some place=2C before doing the=0A= > above.)=0A= >=0A= > =