bzr-tiplog in a local branch

[Eli Zaretskii]

What is "bzr tiplog" supposed to show in a branch whose parent is the
mainline (trunk) branch, after some local commits were merged back to
the parent?  I get this:

  09/29/11 tip:0 105958 eliz at gnu.org [pull] Fix ChangeLog entry for the last co...
  09/29/11 tip:1 105954.1.2 eliz at gnu.org [commit] Restore GNUmakefile.  Fix cap...
  09/29/11 tip:2 105954.1.1 eliz at gnu.org [commit] Fix the MSDOS build.
   msdos/...
  09/29/11 tip:3 105954 eliz at gnu.org [init] * lisp/pcmpl-cvs.el (pcomplete/cvs)...

Those 105954.1.x numbers were unexpected, since they were no
explicitly pulled from mainline.  What happened was this:

  bzr merge --pull           ;; this pulled in 105954
  bzr commit                 ;; committed 2 revisions 105955, 105956
  cd ../trunk && bzr merge   ;; merged to the trunk
  bzr commit                 ;; committed trunk to upstream
  bzr update                 ;; updated trunk from upstream
  cd ../branch && bzr merge --pull

What I expected to see was this:

  09/29/11 tip:0 105958 eliz at gnu.org [pull] Fix ChangeLog entry for the last co...
  09/29/11 tip:1 105954 eliz at gnu.org [init] * lisp/pcmpl-cvs.el (pcomplete/cvs)...

since those are the only 2 pulls I did.  But evidently, that's not
what tiplog shows.  What am I missing?