hi,<br><br>when I do `log -n0 -r 1..1.1.1` I Expected:<br>------------------------------------------------------------<br>revno: 1.1.1<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: tree2<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>
message:<br> tree2 message2<br>------------------------------------------------------------<br>revno: 3<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>
message:<br> message3<br>------------------------------------------------------------<br>revno: 2<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>
message:<br> message2<br>------------------------------------------------------------<br>revno: 1<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>
message:<br> message1<br>----------------------------------------------------------------------<br><br><br><br>But I got:<br>------------------------------------------------------------<br>revno: 1.1.1<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>
branch nick: tree2<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> tree2 message2<br>------------------------------------------------------------<br>revno: 1<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>
branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> message1<br>----------------------------------------------------------------------<br>
<br><br><br>Full log for reference:<br>------------------------------------------------------------<br>revno: 4 [merge]<br>revision-id: amanica@amanica-hplaptop-20090510205130-hv8giq1h3jomq4dd<br>parent: amanica@amanica-hplaptop-20090510205130-7j1ui21a5foszkuz<br>
parent: amanica@amanica-hplaptop-20090510205130-l2a1epjm5ycjabr9<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> merge<br> ------------------------------------------------------------<br>
revno: 1.1.2<br> revision-id: amanica@amanica-hplaptop-20090510205130-l2a1epjm5ycjabr9<br> parent: amanica@amanica-hplaptop-20090510205130-yzg7cno3n5m5djsa<br> committer: Marius Kruger <amanica@amanica-hplaptop><br>
branch nick: tree2<br> timestamp: Sun 2009-05-10 22:51:30 +0200<br> message:<br> tree2 message3<br> ------------------------------------------------------------<br> revno: 1.1.1<br> revision-id: amanica@amanica-hplaptop-20090510205130-yzg7cno3n5m5djsa<br>
parent: amanica@amanica-hplaptop-20090510205130-mf61vd0uqw768bdx<br> committer: Marius Kruger <amanica@amanica-hplaptop><br> branch nick: tree2<br> timestamp: Sun 2009-05-10 22:51:30 +0200<br> message:<br>
tree2 message2<br>------------------------------------------------------------<br>revno: 3<br>revision-id: amanica@amanica-hplaptop-20090510205130-7j1ui21a5foszkuz<br>parent: amanica@amanica-hplaptop-20090510205130-btdipbhmnzr7m18t<br>
committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> message3<br>------------------------------------------------------------<br>revno: 2<br>
revision-id: amanica@amanica-hplaptop-20090510205130-btdipbhmnzr7m18t<br>parent: amanica@amanica-hplaptop-20090510205130-mf61vd0uqw768bdx<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>branch nick: work<br>
timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> message2<br>------------------------------------------------------------<br>revno: 1<br>revision-id: amanica@amanica-hplaptop-20090510205130-mf61vd0uqw768bdx<br>committer: Marius Kruger <amanica@amanica-hplaptop><br>
branch nick: work<br>timestamp: Sun 2009-05-10 22:51:30 +0200<br>message:<br> message1<br>------------------------------------------------------------<br>
<br><br>As you can see it skips some revisions. After doing some debugging,<br>I realised that it skips them because they are not ancestors of the end-revision.<br><br>To be able to know that we must show them, you have to generate the graph AFAICT.<br>
So I thought it might be reasonable to not delay_graph_generation <br>if the user wants to see merge_revisions.<br>This has a performance impact, but I wonder if it is acceptable either way with or without this patch.<br>
<br>If performance is critical here we may be able to cheat a little for this special case<br>and only do this if the user asked for a log up to a dotted revision (if end_rev.find('.'))<br><br>-- <br><| regards<br>
U| Marius<br>H| <>< <br>