/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: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5153.
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)

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