← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-18 19:20:43 UTC
  • mfrom: (3123.1.3 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20071218192043-bxigzty67cddkj7z
(jam) Update zero_ninetythree => one_zero, add one_one deprecation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
28
28
                             common_ancestor,
29
29
                             is_ancestor, MultipleRevisionSources,
30
30
                             NULL_REVISION)
31
 
from bzrlib.symbol_versioning import zero_ninetythree
 
31
from bzrlib.symbol_versioning import one_zero
32
32
from bzrlib.tests import TestCase, TestCaseWithTransport
33
33
from bzrlib.trace import mutter
34
34
from bzrlib.workingtree import WorkingTree
139
139
        br2.lock_read()
140
140
        self.addCleanup(br2.unlock)
141
141
 
142
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
142
        self.assertTrue(self.applyDeprecated(one_zero,
143
143
                        is_ancestor, revisions[0], revisions[0], br1))
144
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
144
        self.assertTrue(self.applyDeprecated(one_zero,
145
145
                        is_ancestor, revisions[1], revisions[0], sources))
146
 
        self.assertFalse(self.applyDeprecated(zero_ninetythree,
 
146
        self.assertFalse(self.applyDeprecated(one_zero,
147
147
                         is_ancestor, revisions[0], revisions[1], sources))
148
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
148
        self.assertTrue(self.applyDeprecated(one_zero,
149
149
                        is_ancestor, revisions_2[3], revisions[0], sources))
150
150
        # disabled mbp 20050914, doesn't seem to happen anymore
151
151
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
152
 
        ##                  revisions[0], br1)        
153
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
152
        ##                  revisions[0], br1)
 
153
        self.assertTrue(self.applyDeprecated(one_zero,
154
154
                        is_ancestor, revisions[3], revisions_2[4], sources))
155
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
155
        self.assertTrue(self.applyDeprecated(one_zero,
156
156
                        is_ancestor, revisions[3], revisions_2[4], br1))
157
 
        self.assertTrue(self.applyDeprecated(zero_ninetythree,
 
157
        self.assertTrue(self.applyDeprecated(one_zero,
158
158
                        is_ancestor, revisions[3], revisions_2[3], sources))
159
159
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
160
160