← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-28 16:13:49 UTC
  • mfrom: (6499.2.3 948339-config-caching)
  • Revision ID: pqm@pqm.ubuntu.com-20120328161349-2gsc0g11fcu43hlc
(vila) Properly share mutable config sections and save the branch config
 only during the final unlock (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
43
43
 
44
44
 
45
45
class MergeBuilder(object):
 
46
 
46
47
    def __init__(self, dir=None):
47
48
        self.dir = osutils.mkdtemp(prefix="merge-test", dir=dir)
48
49
        self.tree_root = generate_ids.gen_root_id()