← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Robert Collins
  • Date: 2006-09-17 21:03:04 UTC
  • mfrom: (2018 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2019.
  • Revision ID: robertc@robertcollins.net-20060917210304-3a697132f5fb68ac
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
19
19
import sys
20
20
import tempfile
21
21
 
22
 
from bzrlib import inventory
 
22
from bzrlib import inventory, treebuilder
23
23
from bzrlib.builtins import merge
24
24
from bzrlib.bzrdir import BzrDir
25
25
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
785
785
        bundle = self.get_valid_bundle(None, 'white-4')
786
786
 
787
787
    def test_alt_timezone_bundle(self):
788
 
        self.tree1 = self.make_branch_and_tree('b1')
 
788
        self.tree1 = self.make_branch_and_memory_tree('b1')
789
789
        self.b1 = self.tree1.branch
 
790
        builder = treebuilder.TreeBuilder()
790
791
 
791
 
        self.build_tree(['b1/newfile'])
792
 
        self.tree1.add(['newfile'])
 
792
        self.tree1.lock_write()
 
793
        builder.start_tree(self.tree1)
 
794
        builder.build(['newfile'])
 
795
        builder.finish_tree()
793
796
 
794
797
        # Asia/Colombo offset = 5 hours 30 minutes
795
798
        self.tree1.commit('non-hour offset timezone', rev_id='tz-1',
801
804
        self.assertEqual('Mon 2006-07-10 20:51:26.000000000 +0530', rev.date)
802
805
        self.assertEqual(19800, rev.timezone)
803
806
        self.assertEqual(1152544886.0, rev.timestamp)
 
807
        self.tree1.unlock()
804
808
 
805
809
    def test_bundle_root_id(self):
806
810
        self.tree1 = self.make_branch_and_tree('b1')