← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: John Arbash Meinel
  • Date: 2006-12-15 15:23:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2191.
  • Revision ID: john@arbash-meinel.com-20061215152343-me4dn3s2f92yd89o
Force the timezone properly during tests which look at dates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
34
34
        self.build_tree_contents([('tree1/a', 'first\n')])
35
35
        tree1.add(['a'], ['a-id'])
36
36
        tree1.commit('a', rev_id='rev-1',
37
 
                     committer="joe@foo.com", timestamp=1166046000.00)
 
37
                     committer="joe@foo.com",
 
38
                     timestamp=1166046000.00, timezone=0)
38
39
 
39
40
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
40
41
 
41
42
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
42
43
        tree1.commit('b', rev_id='rev-2',
43
 
                     committer='joe@foo.com', timestamp=1166046001.00)
 
44
                     committer='joe@foo.com',
 
45
                     timestamp=1166046001.00, timezone=0)
44
46
 
45
47
        self.build_tree_contents([('tree2/a', 'first\nthird\n')])
46
48
        tree2.commit('c', rev_id='rev-1_1_1',
47
 
                     committer="barry@foo.com", timestamp=1166046002.00)
 
49
                     committer="barry@foo.com",
 
50
                     timestamp=1166046002.00, timezone=0)
48
51
 
49
52
        num_conflicts = tree1.merge_from_branch(tree2.branch)
50
53
        self.assertEqual(1, num_conflicts)
53
56
                                 'first\nsecond\nthird\n')])
54
57
        tree1.set_conflicts(conflicts.ConflictList())
55
58
        tree1.commit('merge 2', rev_id='rev-3',
56
 
                     committer='sal@foo.com', timestamp=1166046003.00)
 
59
                     committer='sal@foo.com',
 
60
                     timestamp=1166046003.00, timezone=0)
57
61
        return tree1, tree2
58
62
 
59
63
    def create_deeply_merged_trees(self):
67
71
 
68
72
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
69
73
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
70
 
                     committer='jerry@foo.com', timestamp=1166046003.00)
 
74
                     committer='jerry@foo.com',
 
75
                     timestamp=1166046003.00, timezone=0)
71
76
 
72
77
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
73
78
 
74
79
        tree3.commit('noop', rev_id='rev-1.1.1.1.2',
75
 
                     committer='jerry@foo.com', timestamp=1166046004.00)
 
80
                     committer='jerry@foo.com',
 
81
                     timestamp=1166046004.00, timezone=0)
76
82
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
77
83
        tree1.commit('merge four', rev_id='rev-5')
78
84
 
79
85
        self.build_tree_contents([('tree4/a',
80
86
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
81
87
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
82
 
                     committer='george@foo.com', timestamp=1166046005.00)
 
88
                     committer='george@foo.com',
 
89
                     timestamp=1166046005.00, timezone=0)
83
90
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
84
91
        tree1.commit('merge five and six', rev_id='rev-6')
85
92
        return tree1