~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-06 00:49:26 UTC
  • mfrom: (1587.1.14 bound-branches)
  • Revision ID: pqm@pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1
Merge in bound branches core support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
246
246
                          revisions[4]) # revisions_2[5] is equally valid
247
247
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
248
248
                          revisions[4]) # revisions_2[5] is equally valid
 
249
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
249
250
 
250
251
    def test_combined(self):
251
252
        """combined_graph