← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Aaron Bentley
  • Date: 2005-09-10 23:37:36 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050910233735-0cc3a7a2617bc79c
more cleanups, docs, sorting stuff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
133
133
    """Test checking whether a revision is an ancestor of another revision"""
134
134
 
135
135
    def test_old_common_ancestor(self):
 
136
        """Pick a resonable merge base using the old functionality"""
136
137
        from bzrlib.revision import find_present_ancestors
137
138
        from bzrlib.revision import old_common_ancestor as common_ancestor
138
139
        from bzrlib.revision import MultipleRevisionSources