-
Committer:
Vincent Ladeuil
-
Date:
2010-02-01 16:26:37 UTC
-
mto:
(4999.2.1 integration2)
-
mto:
This revision was merged to the branch mainline in
revision
5001.
-
Revision ID:
v.ladeuil+lp@free.fr-20100201162637-um0ei9j2yktu6zob
Check ancestry so we don't output random revisions.
* bzrlib/tests/blackbox/test_log.py:
(TestBug476293): Reproduce the bug.
* bzrlib/log.py:
(_generate_all_revisions): If merged revisions are involved, the
ancestor check should be explicit.