/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_status.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-15 09:15:03 UTC
  • mfrom: (4595.7.4 409137-lsb-release)
  • Revision ID: pqm@pqm.ubuntu.com-20090815091503-qwbm6glvv31rnujw
(mbp) show platform in selftest, version and backtrace

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
43
43
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
44
 
45
45
    def make_multiple_pending_tree(self):
 
46
        self.thisFailsStrictLockCheck() # clone?
46
47
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
47
48
        tree = self.make_branch_and_tree('a')
48
49
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
53
54
        tree2.commit('commit 3b', timestamp=1196796819, timezone=0)
54
55
        tree3.commit('commit 3c', timestamp=1196796819, timezone=0)
55
56
        tree.merge_from_branch(tree2.branch)
56
 
        tree.merge_from_branch(tree3.branch, force=True)
 
57
        tree.merge_from_branch(tree3.branch)
57
58
        return tree
58
59
 
59
60
    def test_multiple_pending(self):
99
100
 
100
101
    def test_pending_with_ghosts(self):
101
102
        """Test when a pending merge's ancestry includes ghosts."""
 
103
        self.thisFailsStrictLockCheck() # clone?
102
104
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
103
105
        tree = self.make_branch_and_tree('a')
104
106
        tree.commit('empty commit')