← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-30 17:25:27 UTC
  • mto: (1711.4.39 win32-accepted)
  • mto: This revision was merged to the branch mainline in revision 1836.
  • Revision ID: john@arbash-meinel.com-20060630172527-6d36c06a13dc7110
always close files, minor PEP8 cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
23
23
from bzrlib.graph import Graph
24
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
25
                             common_ancestor,
26
 
                             is_ancestor, MultipleRevisionSources,
27
 
                             NULL_REVISION)
 
26
                             is_ancestor, MultipleRevisionSources)
28
27
from bzrlib.tests import TestCaseWithTransport
29
28
from bzrlib.trace import mutter
30
29
from bzrlib.workingtree import WorkingTree
222
221
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
223
222
                        (revisions[4], revisions_2[5]))
224
223
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
225
 
        self.assertEqual(NULL_REVISION,
226
 
            common_ancestor(NULL_REVISION, NULL_REVISION, sources))
227
 
        self.assertEqual(NULL_REVISION,
228
 
            common_ancestor(revisions[0], NULL_REVISION, sources))
229
 
        self.assertEqual(NULL_REVISION,
230
 
            common_ancestor(NULL_REVISION, revisions[0], sources))
231
224
 
232
225
    def test_combined(self):
233
226
        """combined_graph