← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_pull.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_pull.py
110
110
                          tree_a.branch.pull, tree_b.branch,
111
111
                          overwrite=False, stop_revision='rev2b')
112
112
        # It should not have updated the branch tip, but it should have fetched
113
 
        # the revision
 
113
        # the revision if the repository supports "invisible" revisions.
114
114
        self.assertEqual('rev2a', tree_a.branch.last_revision())
115
 
        self.assertTrue(tree_a.branch.repository.has_revision('rev2b'))
 
115
        if tree_a.branch.repository._format.supports_unreferenced_revisions:
 
116
            self.assertTrue(tree_a.branch.repository.has_revision('rev2b'))
116
117
        tree_a.branch.pull(tree_b.branch, overwrite=True,
117
118
                           stop_revision='rev2b')
118
119
        self.assertEqual('rev2b', tree_a.branch.last_revision())