Explorer & QBzr Log

[Eric Berry]

Hi John,
   Thanks for the reply.

How does qlog get that information then?

What does the multiple parents mean? Actually, it looks like parent1 of
revision 5170 is the same as parent1 of 5169.1.1 - you think this id is the
same as revno 5169 on the main line correct? Parent 2 of 5170 is the revno
of the feature branch?

What is the second parent on the 5169.1.1?

Thanks again for the help,
Eric

On Wed, Apr 21, 2010 at 6:52 PM, John Arbash Meinel
<john at arbash-meinel.com>wrote:

>
> You can look at the revision information, and see that it has more than
> 1 parent.
>
> qlog doesn't parse 'bzr log' to get that information. But if you are
> looking to do so, you'll probably want to do:
>
> bzr log --show-ids -n0
>
> If you do, you should see stuff like:
>
> - ------------------------------------------------------------
> revno: 5170 [merge]
> revision-id: pqm at pqm.ubuntu.com-20100421114839-4elxlyab2r06ryj3
> parent: pqm at pqm.ubuntu.com-20100421050502-7540qdf2nxuvlq0c
> parent: v.ladeuil+lp at free.fr-20100421084320-nbw59sgn3j4dh2io
> committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
> branch nick: +trunk
> timestamp: Wed 2010-04-21 12:48:39 +0100
> message:
>  (vila) Fix bt.test_diff imports
>    ------------------------------------------------------------
>    revno: 5169.1.1 [merge]
>    revision-id: v.ladeuil+lp at free.fr-20100421084320-nbw59sgn3j4dh2io
>    parent: pqm at pqm.ubuntu.com-20100421050502-7540qdf2nxuvlq0c
>    parent: v.ladeuil+lp at free.fr-20100420144401-dzst0y5fyvxd31p2
>    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr<v.ladeuil%2Blp at free.fr>
> >
>    branch nick: integration
>    timestamp: Wed 2010-04-21 10:43:20 +0200
>    message:
>      Fix bt.test_diff imports
>
> Note that there are 2 'parent:' entries in 5169.1.1, one of which is a
> 'pqm@' revision, which is from the bzr mainline. (5169 if I'm not
> mistaken.)
>
> John
> =:->
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Cygwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAkvPq8UACgkQJdeBCYSNAAMDQgCgnjbbuz8ONGBuWFE4GqHVcI4V
> 4O8AoIqTjpfW40csUxYtRozxgkACg8nB
> =qDDk
> -----END PGP SIGNATURE-----
>



-- 
Learn from the past. Live in the present. Plan for the future.
Blog: http://www.townsfolkdesigns.com/blogs/elberry
jEdit <http://www.jedit.org> - Programmer's Text Editor
Bazaar <http://bazaar.canonical.com> - Version Control for Humans
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100421/1c5fb4af/attachment-0001.htm