Hi John, <br> Thanks for the reply.<br><br>How does qlog get that information then?<br><br>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?<br>
<br>What is the second parent on the 5169.1.1?<br><br>Thanks again for the help,<br>Eric<br><br><div class="gmail_quote">On Wed, Apr 21, 2010 at 6:52 PM, John Arbash Meinel <span dir="ltr"><<a href="mailto:john@arbash-meinel.com">john@arbash-meinel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br>You can look at the revision information, and see that it has more than<br>
1 parent.<br>
<br>
qlog doesn't parse 'bzr log' to get that information. But if you are<br>
looking to do so, you'll probably want to do:<br>
<br>
bzr log --show-ids -n0<br>
<br>
If you do, you should see stuff like:<br>
<br>
- ------------------------------------------------------------<br>
revno: 5170 [merge]<br>
revision-id: pqm@pqm.ubuntu.com-20100421114839-4elxlyab2r06ryj3<br>
parent: pqm@pqm.ubuntu.com-20100421050502-7540qdf2nxuvlq0c<br>
parent: v.ladeuil+lp@free.fr-20100421084320-nbw59sgn3j4dh2io<br>
committer: Canonical.com Patch Queue Manager <<a href="mailto:pqm@pqm.ubuntu.com">pqm@pqm.ubuntu.com</a>><br>
branch nick: +trunk<br>
timestamp: Wed 2010-04-21 12:48:39 +0100<br>
message:<br>
(vila) Fix bt.test_diff imports<br>
------------------------------------------------------------<br>
revno: 5169.1.1 [merge]<br>
revision-id: v.ladeuil+lp@free.fr-20100421084320-nbw59sgn3j4dh2io<br>
parent: pqm@pqm.ubuntu.com-20100421050502-7540qdf2nxuvlq0c<br>
parent: v.ladeuil+lp@free.fr-20100420144401-dzst0y5fyvxd31p2<br>
committer: Vincent Ladeuil <<a href="mailto:v.ladeuil%2Blp@free.fr">v.ladeuil+lp@free.fr</a>><br>
branch nick: integration<br>
timestamp: Wed 2010-04-21 10:43:20 +0200<br>
message:<br>
Fix bt.test_diff imports<br>
<br>
Note that there are 2 'parent:' entries in 5169.1.1, one of which is a<br>
'pqm@' revision, which is from the bzr mainline. (5169 if I'm not mistaken.)<br>
<br>
John<br>
=:-><br>
-----BEGIN PGP SIGNATURE-----<br>
Version: GnuPG v1.4.9 (Cygwin)<br>
Comment: Using GnuPG with Mozilla - <a href="http://enigmail.mozdev.org/" target="_blank">http://enigmail.mozdev.org/</a><br>
<br>
iEYEARECAAYFAkvPq8UACgkQJdeBCYSNAAMDQgCgnjbbuz8ONGBuWFE4GqHVcI4V<br>
4O8AoIqTjpfW40csUxYtRozxgkACg8nB<br>
=qDDk<br>
-----END PGP SIGNATURE-----<br>
</blockquote></div><br><br clear="all"><br>-- <br>Learn from the past. Live in the present. Plan for the future.<br>Blog: <a href="http://www.townsfolkdesigns.com/blogs/elberry">http://www.townsfolkdesigns.com/blogs/elberry</a><br>
jEdit <<a href="http://www.jedit.org">http://www.jedit.org</a>> - Programmer's Text Editor<br>Bazaar <<a href="http://bazaar.canonical.com">http://bazaar.canonical.com</a>> - Version Control for Humans<br>