← 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: Vincent Ladeuil
  • Date: 2012-03-13 16:28:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6512.
  • Revision ID: v.ladeuil+lp@free.fr-20120313162830-83ekrd4ghqru0whh
https://launchpad.net/bugs/948339
Save branch config options only during the final unlock

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()