← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-27 04:42:41 UTC
  • mfrom: (1092.1.43)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050827044241-23d676133b9fc981
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
18
 
from bzrlib.selftest import TestCaseInTempDir
19
 
from bzrlib.errors import NoCommonAncestor, NoCommits
20
 
from bzrlib.branch import copy_branch
21
 
from bzrlib.merge import merge
22
 
 
23
 
class TestRevisionNamespaces(TestCaseInTempDir):
 
17
 
 
18
from bzrlib.selftest import InTempDir
 
19
 
 
20
class TestRevisionNamespaces(InTempDir):
 
21
 
24
22
    def test_revision_namespaces(self):
25
23
        """Functional tests for hashcache"""
26
24
        from bzrlib.errors import NoSuchRevision
27
25
        from bzrlib.branch import Branch
 
26
        import os
 
27
        import time
28
28
 
29
29
        b = Branch('.', init=True)
30
30
 
48
48
        os.mkdir('newbranch')
49
49
        b2 = Branch('newbranch', init=True)
50
50
        self.assertEquals(b2.lookup_revision('revid:a@r-0-1'), 'a@r-0-1')
51
 
 
52
 
        self.assertRaises(NoCommits, b2.lookup_revision, 'ancestor:.')
53
 
        self.assertEquals(b.lookup_revision('ancestor:.'), 'a@r-0-3')
54
 
        os.mkdir('copy')
55
 
        b3 = copy_branch(b, 'copy')
56
 
        b3.commit('Commit four', rev_id='b@r-0-4')
57
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'a@r-0-3')
58
 
        merge(['copy', -1], [None, None])
59
 
        b.commit('Commit five', rev_id='a@r-0-4')
60
 
        self.assertEquals(b.lookup_revision('ancestor:copy'), 'b@r-0-4')
61
 
        self.assertEquals(b3.lookup_revision('ancestor:.'), 'b@r-0-4')