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

  • Committer: Vincent Ladeuil
  • Date: 2010-02-11 09:21:45 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092145-drh33z43szccfswy
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
54
54
    )
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
 
57
from bzrlib.transport import memory
57
58
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
58
59
from bzrlib.smtp_connection import SMTPConnection
59
60
from bzrlib.workingtree import WorkingTree
3445
3446
            return stub_sftp.SFTPAbsoluteServer
3446
3447
        if typestring == "memory":
3447
3448
            from bzrlib.tests import test_server
3448
 
            return test_server.MemoryServer
 
3449
            return memory.MemoryServer
3449
3450
        if typestring == "fakenfs":
3450
3451
            from bzrlib.tests import test_server
3451
3452
            return test_server.FakeNFSServer