Bzr help

[Tassilo Horn <tsdh@gnu.org>]

Hi all,

it seems I've done something wrong, and now I've messed up my checkout a
bit.

I've been documenting another item from etc/NEWS, and committed my
changes (no bound branch).  When I wanted to bzr push, I got a message
that the branches have diverged.

I've done "bzr pull" and "bzr merge" followed by a "bzr commit".  When I
wanted to push then, I got:

--8<---------------cut here---------------start------------->8---
Using saved push location: bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/trunk/
bzr: ERROR: Server sent an unexpected error: ('error', 'AppendRevisionsOnlyViolation', 'Operation denied because it would change the main history, which is not permitted by the append_revisions_only setting on branch "filtered-172644364:///emacs/trunk/".')
--8<---------------cut here---------------end--------------->8---

With "bzr log" I can see that the commit in between (Bozhidar's rename
of helpers.el to subr-x.el) isn't there separately but it seems like
I've done that myself!

--8<---------------cut here---------------start------------->8---
% bzr log --verbose 
------------------------------------------------------------
revno: 115646 [merge]
committer: Tassilo Horn <tsdh@gnu.org>
branch nick: trunk
timestamp: Fri 2013-12-20 17:28:07 +0100
message:
  merge with trunk
removed:
  lisp/emacs-lisp/helpers.el
added:
  lisp/emacs-lisp/subr-x.el
modified:
  etc/NEWS
  lisp/ChangeLog
------------------------------------------------------------
revno: 115645
committer: Tassilo Horn <tsdh@gnu.org>
branch nick: trunk
timestamp: Fri 2013-12-20 17:24:41 +0100
message:
  Document that =, <, <=, >, >= now accept one or many arguments.
  
  * doc/lispref/numbers.texi (numbers): Document that =, <, <=, >, >= now accept
  one or many arguments.
modified:
  doc/lispref/ChangeLog
  doc/lispref/numbers.texi
  etc/NEWS
------------------------------------------------------------
--8<---------------cut here---------------end--------------->8---

"bzr missing" now shows me Bozhidar's commit.

--8<---------------cut here---------------start------------->8---
You are missing 1 revision:
------------------------------------------------------------
revno: 115646
committer: Bozhidar Batsov <bozhidar@batsov.com>
branch nick: master
timestamp: Fri 2013-12-20 18:37:10 +0200
message:
  * lisp/emacs-lisp/subr-x.el: (string-remove-prefix): New function.
  (string-remove-suffix): New function.
--8<---------------cut here---------------end--------------->8---

Ups, I've thought another "bzr merge" and "bzr commit" would probably
work, but now I have two merge commits on top.

--8<---------------cut here---------------start------------->8---
------------------------------------------------------------
revno: 115647 [merge]
committer: Tassilo Horn <tsdh@gnu.org>
branch nick: trunk
timestamp: Fri 2013-12-20 17:43:23 +0100
message:
  merge again
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/emacs-lisp/subr-x.el
------------------------------------------------------------
revno: 115646 [merge]
committer: Tassilo Horn <tsdh@gnu.org>
branch nick: trunk
timestamp: Fri 2013-12-20 17:28:07 +0100
message:
  merge with trunk
removed:
  lisp/emacs-lisp/helpers.el
added:
  lisp/emacs-lisp/subr-x.el
modified:
  etc/NEWS
  lisp/ChangeLog
------------------------------------------------------------
revno: 115645
committer: Tassilo Horn <tsdh@gnu.org>
branch nick: trunk
timestamp: Fri 2013-12-20 17:24:41 +0100
message:
  Document that =, <, <=, >, >= now accept one or many arguments.
  
  * doc/lispref/numbers.texi (numbers): Document that =, <, <=, >, >= now accept
  one or many arguments.
modified:
  doc/lispref/ChangeLog
  doc/lispref/numbers.texi
  etc/NEWS
--8<---------------cut here---------------end--------------->8---

Now "bzr missing" tells me I have 3 extra revisions.  It doesn't
complain anymore about Bozhidar's commit missing, although that's still
missing from the log.

How do I get back into a good, pushable state, preferably without losing
my commit 115645 (or at least the changes)?  (I haven't tried pushing in
fear of being able to screw things up.)

And what did I do wrong in the first place?

Thanks,
Tassilo