unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "Vincent Belaïche" <vincent.b.1@hotmail.fr>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: RE: Addition of SES local printer functions.
Date: Fri, 3 Jan 2014 10:40:35 +0100	[thread overview]
Message-ID: <DUB109-W51DC4B0CBF5F1E87A88B5884CA0@phx.gbl> (raw)
In-Reply-To: <83ha9lxzv1.fsf@gnu.org>

Hello Eli,

I did bzr merge -r 115841..115824 ., but then it has output this:


 M  admin/ChangeLog
 M  admin/admin.el
 M  admin/check-doc-strings
 M  admin/unidata/unidata-gen.el
 M  config.bat
 M  configure.ac
 M  doc/emacs/emacs-xtra.texi
 M  doc/emacs/emacs.texi
 M  doc/emacs/maintaining.texi
 M  doc/emacs/text.texi
 M  doc/lispintro/emacs-lisp-intro.texi
 M  doc/lispref/ChangeLog
 M  doc/lispref/display.texi
 M  doc/lispref/elisp.texi
 M  doc/lispref/nonascii.texi
 M  doc/lispref/numbers.texi
 M  doc/lispref/tips.texi
 M  doc/man/ebrowse.1
 M  doc/man/emacs.1
 M  doc/man/etags.1
 M  doc/man/grep-changelog.1
 M  doc/misc/ChangeLog
 M  doc/misc/Makefile.in
 M  doc/misc/ada-mode.texi
 M  doc/misc/auth.texi
 M  doc/misc/autotype.texi
 M  doc/misc/bovine.texi
 M  doc/misc/calc.texi
 M  doc/misc/cc-mode.texi
 M  doc/misc/cl.texi
 M  doc/misc/dbus.texi
 M  doc/misc/dired-x.texi
 M  doc/misc/ebrowse.texi
 M  doc/misc/ede.texi
 M  doc/misc/ediff.texi
 M  doc/misc/edt.texi
 M  doc/misc/efaq.texi
 M  doc/misc/eieio.texi
 M  doc/misc/emacs-gnutls.texi
 M  doc/misc/emacs-mime.texi
 M  doc/misc/epa.texi
 M  doc/misc/erc.texi
 M  doc/misc/ert.texi
 M  doc/misc/eshell.texi
 M  doc/misc/eudc.texi
 M  doc/misc/flymake.texi
 M  doc/misc/forms.texi
 M  doc/misc/gnus-coding.texi
 M  doc/misc/gnus-news.el
 M  doc/misc/gnus.texi
 M  doc/misc/idlwave.texi
 M  doc/misc/ido.texi
 M  doc/misc/info.texi
 M  doc/misc/mairix-el.texi
 M  doc/misc/message.texi
 M  doc/misc/mh-e.texi
 M  doc/misc/newsticker.texi
 M  doc/misc/nxml-mode.texi
 M  doc/misc/octave-mode.texi
 M  doc/misc/org.texi
 M  doc/misc/pcl-cvs.texi
 M  doc/misc/pgg.texi
 M  doc/misc/rcirc.texi
 M  doc/misc/reftex.texi
 M  doc/misc/remember.texi
 M  doc/misc/sasl.texi
 M  doc/misc/sc.texi
 M  doc/misc/semantic.texi
 M  doc/misc/ses.texi
 M  doc/misc/sieve.texi
 M  doc/misc/smtpmail.texi
 M  doc/misc/speedbar.texi
 M  doc/misc/srecode.texi
 M  doc/misc/texinfo.tex
 M  doc/misc/tramp.texi
 M  doc/misc/url.texi
 M  doc/misc/vip.texi
 M  doc/misc/viper.texi
 M  doc/misc/widget.texi
 M  doc/misc/wisent.texi
 M  doc/misc/woman.texi
 M  etc/NEWS
 M  etc/images/README
 M  etc/images/checked.xpm
 M  etc/images/gnus/README
 M  etc/images/gud/README
 M  etc/images/icons/README
 M  etc/images/mh-logo.xpm
 M  etc/images/splash.xpm
 M  etc/images/unchecked.xpm
 M  etc/refcards/README
 M  etc/refcards/gnus-refcard.tex
 M  etc/refcards/ru-refcard.tex
 M  etc/tutorials/TUTORIAL.cn
 M  etc/tutorials/TUTORIAL.he
 M  etc/tutorials/TUTORIAL.nl
 M  etc/tutorials/TUTORIAL.ro
 M  etc/tutorials/TUTORIAL.sl
 M  lib-src/rcs2log
 M  lib/getopt_.h
 M  lisp/ChangeLog
 M  lisp/cedet/semantic/imenu.el
 M  lisp/dired-aux.el
 M  lisp/mail/rmail.el
 M  lisp/mail/rmailmm.el
 M  lisp/net/tramp-sh.el
 M  lisp/org/ox-html.el
 M  lisp/ses.el
 M  msdos/README
 M  msdos/autogen/Makefile.in
 M  msdos/depfiles.bat
 M  msdos/sed2v2.inp
 M  nt/config.nt
 M  nt/configure.bat
 M  nt/emacs.rc
 M  nt/emacsclient.rc
 M  nt/icons/README
 M  src/ChangeLog
 M  src/bidi.c
 M  src/fileio.c
 M  src/frame.c
 M  src/indent.c
 M  src/insdel.c
 M  src/lisp.h
 M  src/lread.c
 M  src/search.c
 M  src/w32fns.c
 M  src/w32term.c
 M  src/window.c
 M  src/xdisp.c
 M  src/xfns.c
 M  src/xterm.c
All changes applied successfully.

So there seemed to be far more files implied than the 4 which I have modified. For that reason I did not do the commit. Should I ? 

Maybe the reason is that I did two commits in a row to apply the change.

I have saved my changes somewhere so no problem if I simply destroy my work area and pull a new clean one.

By the way, I will subscribe to the announce list, that is an excellent idea, reading all the emails on the devel list is simply impossible for my level of involvement.

   Vincent.

----------------------------------------
> Date: Fri, 3 Jan 2014 09:56:34 +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ïche <vincent.b.1@hotmail.fr>
>> Date: Fri, 03 Jan 2014 00:08:38 +0100
>> Cc: emacs-devel@gnu.org
>>
>> Please explain me how to "uncommit" the change, and I can undo it, so
>> that the local printers function is introduced later on.
>
> Like this:
>
> bzr merge -r N..N-1 .
> bzr commit -m "Reverted SES changes for local printer functions."
>
> where N is the revision number you committed, N-1 is the revision
> number before that. Note all the dots in the first command: they are
> important.
>
> (You may wish to save your changes in some place, before doing the
> above.)
>
> 		 	   		  


  reply	other threads:[~2014-01-03  9:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-02 23:08 Addition of SES local printer functions Vincent Belaïche
2014-01-03  0:27 ` Glenn Morris
2014-01-03  2:45   ` Stefan Monnier
2014-01-03  3:18     ` Glenn Morris
2014-01-03  5:14       ` Stefan Monnier
2014-01-03 20:31         ` Glenn Morris
2014-01-03  7:56 ` Eli Zaretskii
2014-01-03  9:40   ` Vincent Belaïche [this message]
2014-01-03 10:34     ` Eli Zaretskii
  -- strict thread matches above, loose matches on Subject: below --
2014-01-03 12:44 Vincent Belaïche
2014-01-03 13:55 ` Eli Zaretskii
2014-01-03 14:24   ` Vincent Belaïche
2014-01-02 22:59 Vincent Belaïche
2014-01-02 23:09 ` Óscar Fuentes
2014-01-02 21:11 Vincent Belaïche
2014-01-02 21:36 ` Óscar Fuentes
2014-01-03  0:20 ` Glenn Morris
2014-01-02 20:23 Vincent Belaïche
2014-01-02 21:01 ` Eli Zaretskii
2014-01-02 13:31 Vincent Belaïche
2014-01-02 19:35 ` Glenn Morris
2014-01-02 21:07   ` Stefan Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DUB109-W51DC4B0CBF5F1E87A88B5884CA0@phx.gbl \
    --to=vincent.b.1@hotmail.fr \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).