← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-09-09 00:32:58 UTC
  • mfrom: (5348.1.2 deprecation)
  • mto: This revision was merged to the branch mainline in revision 5415.
  • Revision ID: mbp@sourcefrog.net-20100909003258-ioyugglvmu32yvff
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
33
33
    errors,
34
34
    push,
35
35
    repository,
 
36
    symbol_versioning,
36
37
    tests,
37
38
    )
38
39
from bzrlib.branch import Branch
68
69
        self.assertEqual(result.old_revid, 'M1')
69
70
        self.assertEqual(result.new_revid, 'P2')
70
71
        # and it can be treated as an integer for compatibility
71
 
        self.assertEqual(int(result), 0)
 
72
        self.assertEqual(self.applyDeprecated(
 
73
            symbol_versioning.deprecated_in((2, 3, 0)),
 
74
            result.__int__),
 
75
            0)
72
76
 
73
77
    def test_push_merged_indirect(self):
74
78
        # it should be possible to do a push from one branch into another