← 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: Robert Collins
  • Date: 2006-04-18 22:41:16 UTC
  • mto: (1711.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1671.
  • Revision ID: robertc@robertcollins.net-20060418224116-9b723440fa56e404
 * 'Metadir' is now the default disk format. This improves behaviour in
   SFTP using circumstances and allows binding and rebinding and easier
   use of repositories. (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')], []))