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

  • Committer: Ian Clatworthy
  • Date: 2009-04-03 00:07:49 UTC
  • mfrom: (4241 +trunk)
  • mto: (4265.1.1 bbc-merge)
  • mto: This revision was merged to the branch mainline in revision 4280.
  • Revision ID: ian.clatworthy@canonical.com-20090403000749-sevl9klctwfi8jml
merge bzr.dev r4241

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
20
20
"""
21
21
 
22
22
 
 
23
from copy import deepcopy
23
24
import os
24
25
 
25
26
from bzrlib import (
26
27
    errors,
27
28
    mutabletree,
 
29
    osutils,
28
30
    revision as _mod_revision,
29
31
    )
30
 
from bzrlib.decorators import needs_read_lock
 
32
from bzrlib.decorators import needs_read_lock, needs_write_lock
31
33
from bzrlib.osutils import sha_file
32
34
from bzrlib.mutabletree import needs_tree_write_lock
33
35
from bzrlib.transport.memory import MemoryTransport