From: Eli Zaretskii <eliz@gnu.org>
To: "Vincent Belaïche" <vincent.b.1@hotmail.fr>
Cc: emacs-devel@gnu.org
Subject: Re: Addition of SES local printer functions.
Date: Fri, 03 Jan 2014 12:34:24 +0200 [thread overview]
Message-ID: <8361q1xsjz.fsf@gnu.org> (raw)
In-Reply-To: <DUB109-W51DC4B0CBF5F1E87A88B5884CA0@phx.gbl>
> From: Vincent Belaïche <vincent.b.1@hotmail.fr>
> CC: emacs-devel <emacs-devel@gnu.org>
> 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 modified. 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."
next prev parent reply other threads:[~2014-01-03 10:34 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
2014-01-03 10:34 ` Eli Zaretskii [this message]
-- 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=8361q1xsjz.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=vincent.b.1@hotmail.fr \
/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).