[MERGE] [BUG #172970] bzrlib.revision.is_ancestor should use graph functions.
Martin Pool
mbp at canonical.com
Fri Nov 30 06:11:06 GMT 2007
Martin Pool has voted resubmit.
Status is now: Resubmit
Comment:
This passes in its own branch, but fails for me when merged into bzr.1.0
with
^^^^[log from
bzrlib.tests.test_ancestry.TestAncestry.test_none_is_ancestor_non_empty_branch]
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/mbp/repo/ancestry-hacks/bzrlib/tests/test_ancestry.py",
line 55, in test_none_is_ancestor_non_empty_branch
self.assertFalse(is_ancestor('null:', rev_id, branch))
File "/home/mbp/repo/ancestry-hacks/bzrlib/revision.py", line 139, in
is_ancestor
return branch.repository.get_graph().is_ancestor(candidate_id,
revision_id)
File "/home/mbp/repo/ancestry-hacks/bzrlib/graph.py", line 351, in
is_ancestor
[candidate_ancestor, candidate_descendant])
File "/home/mbp/repo/ancestry-hacks/bzrlib/graph.py", line 276, in
heads
ancestors.update(searcher.next())
File "/home/mbp/repo/ancestry-hacks/bzrlib/graph.py", line 435, in
next
self._search_revisions):
File "/home/mbp/repo/ancestry-hacks/bzrlib/repofmt/pack_repo.py", line
1611, in get_parents
self._pack_collection.ensure_loaded()
File "/home/mbp/repo/ancestry-hacks/bzrlib/repofmt/pack_repo.py", line
1036, in ensure_loaded
assert self.repo.is_locked()
AssertionError
probably something pretty trivial...
For details, see:
http://bundlebuggy.aaronbentley.com/request/%3C20071130033915.0BA4E55FFA%40juju.arbash-meinel.com%3E
More information about the bazaar
mailing list