ERROR: These branches have diverged.

[Sam Steingold]

I am stuck again.
what I want is a cvs-like approach: I want to have the most recent 
version of the source tree, occasionally submitting a patch. "cvs up" 
will mark the locally patched files with "M" until my patch is committed 
by a maintainer (after which "cvs up" becomes silent again).

what happened is that I submitted a patch and committed it locally (why 
did I do it? dunno - maybe to quiet some other warning?) and now I don't 
know what to do to get in sync with the master repository again.

$ bzr revert
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
All changes applied successfully.
$ bzr pull
Using saved location: http://bzr.xsteve.at/dvc/
bzr: ERROR: These branches have diverged.  Use the merge command to 
reconcile them.
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
bzr: ERROR: Working tree has uncommitted changes.
$ bzr revert
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
All changes applied successfully.
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
bzr: ERROR: Working tree has uncommitted changes.
$ bzr revert
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
All changes applied successfully.
$ bzr revert
$ bzr pull
Using saved location: http://bzr.xsteve.at/dvc/
bzr: ERROR: These branches have diverged.  Use the merge command to 
reconcile them.
$ bzr status
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
All changes applied successfully.
$ bzr status
modified:
   configure.ac
   lisp/baz.el
   lisp/dvc-log.el
   lisp/tla-core.el
   lisp/tla-defs.el
   lisp/tla.el
   lisp/xhg-mq.el
pending merges:
   Stefan Reichoer 2007-03-22 configure.ac: a default ./configure works 
now ...
     Stefan Reichoer 2007-03-21 dvc-log: New function: 
dvc-log-edit-insert-in...
     Stefan Reichoer 2007-03-21 xhg-mq: refresh the patch buffer after 
deleti...
     Stefan Reichoer 2007-03-20 Implemented a way for dvc-log-edit modes 
to i...
     Stefan Reichoer 2007-03-17 Handle no longer present patches in 
xhg-mq-sh...
     Stefan Reichoer 2007-03-17 Merged the mini annotate mode from Matthieu
     Matthieu Moy 2007-03-16 Mini annotate-mode.
     Matthieu Moy 2007-03-16 Added missing ;;;###autoload (fixes #8741) 
<<---- this is my patch!!!
$ bzr update
Tree is up to date at revision 138.
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
bzr: ERROR: Working tree has uncommitted changes.
$ bzr revert
$ bzr status
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
All changes applied successfully.
$ bzr missing
Using last location: http://bzr.xsteve.at/dvc/
You have 1 extra revision(s):
------------------------------------------------------------
revno: 138
committer: Sam Steingold <sds at janestcapital.com>
branch nick: dvc
timestamp: Fri 2007-03-16 13:10:46 -0400
message:
   autoload tla-file-has-conflict-p http://gna.org/bugs/?8741



You are missing 6 revision(s):
------------------------------------------------------------
revno: 143
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Thu 2007-03-22 20:11:15 +0100
message:
   configure.ac: a default ./configure works now even when tla and baz 
are not available
------------------------------------------------------------
revno: 142
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Wed 2007-03-21 21:49:18 +0100
message:
   dvc-log: New function: dvc-log-edit-insert-initial-commit-message 
(bound to C-c C-i)
------------------------------------------------------------
revno: 141
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Wed 2007-03-21 21:48:32 +0100
message:
   xhg-mq: refresh the patch buffer after deleting a patch
------------------------------------------------------------
revno: 140
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Tue 2007-03-20 22:08:09 +0100
message:
   Implemented a way for dvc-log-edit modes to insert an initial commit 
message.
   This message is based on the working directory root

   The following simple example will insert "Merged from upstream" when 
commiting  to ~/work/myproject/:
   (dvc-log-edit-register-initial-content-function "~/work/myproject/" 
'(lambda() "Merged from upstream"))
------------------------------------------------------------
revno: 139
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Sat 2007-03-17 13:13:24 +0100
message:
   Handle no longer present patches in xhg-mq-show-stack

   xhg-mq-show-stack now removes no longer present patches, when called
   to update the current patch view
------------------------------------------------------------
revno: 138
committer: Stefan Reichoer <stefan at xsteve.at>
branch nick: dvc-dev-bzr
timestamp: Sat 2007-03-17 11:40:50 +0100
message:
   Merged the mini annotate mode from Matthieu
$