/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Robert Collins
  • Date: 2008-02-13 03:30:01 UTC
  • mfrom: (3221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3224.
  • Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.

Show diffs side-by-side

added added

removed removed

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