From: "Vincent Belaïche" <vincent.b.1@hotmail.fr>
To: Glenn Morris <rgm@gnu.org>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
Subject: RE: Addition of SES local printer functions.
Date: Thu, 02 Jan 2014 21:23:55 +0100 [thread overview]
Message-ID: <80k3eiqgis.fsf@gmail.com> (raw)
Hello Glenn,
bzr status outputs the following:
-----------------------------------------------------------------------
bzr status
modified:
doc/misc/ChangeLog
doc/misc/ses.texi
lisp/ChangeLog
lisp/ses.el
unknown:
build4.log
ses-local-printers.txt
leim/ja-dic/
leim/leim-list.el
lisp/c;c
src/stamp-oldxmenu
conflicts:
Conflict: can't delete info because it is not empty. Not deleting.
-----------------------------------------------------------------------
Concerning feature freeze exception, er... I am sorry if I did something
wrong, this change has been agreed a few months ago and some advice how
to implement was given by Stefan, but I hadn't any time to implement it
until now.
I acknowledge that this is not a _small_ change because it is involves
the file format, so maybe if EMACS is in a feature freeze phase it would
be wiser to delay the change or move it to some pending branch. Despite
the testing that I did, there of course may be bugs involved as in any
change of that sort.
Anyhow, I am not aware of such "feature freeze" exception, how should I
have received it --- is that some email or some message produced by bzr?
Vincent.
> From: rgm@gnu.org
> To: vincent.b.1@hotmail.fr
> Subject: Re: Addition of SES local printer functions.
> Date: Thu, 2 Jan 2014 14:35:44 -0500
> CC: monnier@iro.umontreal.ca; emacs-devel@gnu.org
>
> Vincent Belaïche wrote:
>
> > bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.
> [...]
> > bzr conflicts does not work --- probably m version of bazaar is outdated.
>
> "Does not work" is vague. Try: bzr status
>
> > Feedback is welcome.
>
> Did you receive a feature-freeze exception for this change?
>
next reply other threads:[~2014-01-02 20:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-02 20:23 Vincent Belaïche [this message]
2014-01-02 21:01 ` Addition of SES local printer functions 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 23:08 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
2014-01-03 10:34 ` Eli Zaretskii
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 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=80k3eiqgis.fsf@gmail.com \
--to=vincent.b.1@hotmail.fr \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=rgm@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).