← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/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_branch/test_push.py
30
30
    push,
31
31
    repository,
32
32
    revision,
 
33
    symbol_versioning,
33
34
    tests,
34
35
    transport,
35
36
    )
61
62
        self.assertEqual(result.old_revid, 'M1')
62
63
        self.assertEqual(result.new_revid, 'P2')
63
64
        # and it can be treated as an integer for compatibility
64
 
        self.assertEqual(int(result), 0)
 
65
        self.assertEqual(self.applyDeprecated(
 
66
            symbol_versioning.deprecated_in((2, 3, 0)),
 
67
            result.__int__),
 
68
            0)
65
69
 
66
70
    def test_push_merged_indirect(self):
67
71
        # it should be possible to do a push from one branch into another