← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
46
46
        self.assertContainsRe(output.getvalue(), 'empty commit')
47
47
 
48
48
    def make_multiple_pending_tree(self):
49
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
49
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
50
50
        tree = self.make_branch_and_tree('a')
51
51
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
52
52
        tree2 = tree.bzrdir.clone('b').open_workingtree()
102
102
 
103
103
    def test_pending_with_ghosts(self):
104
104
        """Test when a pending merge's ancestry includes ghosts."""
105
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
105
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
106
106
        tree = self.make_branch_and_tree('a')
107
107
        tree.commit('empty commit')
108
108
        tree2 = tree.bzrdir.clone('b').open_workingtree()