← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-19 08:31:08 UTC
  • mfrom: (1666.1.5 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060419083108-fab2970f4575b010
Change the default branch format to be metadir. (Robert Collins, Aaron Bentley).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
35
35
        self.assertEqual(find_unmerged(original, puller), ([], []))
36
36
        original_tree.commit('a', rev_id='a')
37
37
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
38
 
        puller.pull(original)
 
38
        puller_tree.pull(original)
39
39
        self.assertEqual(find_unmerged(original, puller), ([], []))
40
 
        merger.pull(original)
 
40
        merger_tree.pull(original)
41
41
        original_tree.commit('b', rev_id='b')
42
42
        original_tree.commit('c', rev_id='c')
43
43
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
44
44
                                                            (3, u'c')], []))
45
45
 
46
 
        puller.pull(original)
 
46
        puller_tree.pull(original)
47
47
        self.assertEqual(find_unmerged(original, puller), ([], []))
48
48
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
49
49
                                                            (3, u'c')], []))