/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: Canonical.com Patch Queue Manager
  • Date: 2009-12-01 00:10:04 UTC
  • mfrom: (4798.6.3 fix-190096)
  • Revision ID: pqm@pqm.ubuntu.com-20091201001004-vflb5bqsnrlkfh7p
Including a discussion of revert --forget-merges as a tool for
        advanced merging. (Neil Martinsen-Burrell, #190096)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
25
25
from bzrlib import (
26
26
    errors,
27
27
    mutabletree,
 
28
    osutils,
28
29
    revision as _mod_revision,
29
30
    )
30
 
from bzrlib.decorators import needs_read_lock
 
31
from bzrlib.decorators import needs_read_lock, needs_write_lock
31
32
from bzrlib.osutils import sha_file
32
33
from bzrlib.mutabletree import needs_tree_write_lock
33
34
from bzrlib.transport.memory import MemoryTransport