bzr-tiplog in a local branch

[John Meinel]

Tiplog is showing you what tips the branch used to have, and mapping them to
their current dotted revnos.

1) You did an action which changed the tip (merge --pull). Tiplog currently
always treats the first action as init.
2) you then did commit which gave it a new tip rev
3) you did that again
4) you did another action which changed the tip again (merge --pull). Which
also happened to change the mainline and revision numbers.

I'm not sure what you were expecting. But consider tiplog as an audit
history of the contents if .bzr/branch/last-revision

John
=:->
On Sep 29, 2011 4:47 PM, "Eli Zaretskii" <eliz at gnu.org> wrote:
> 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?
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110929/d4b0cc08/attachment.html>