~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

Merge in format-5 work - release bzr 0.1rc1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
import time
19
19
from bzrlib.selftest import TestCaseInTempDir
20
20
from bzrlib.errors import NoCommonAncestor, NoCommits
21
 
from bzrlib.branch import copy_branch
 
21
from bzrlib.clone import copy_branch
22
22
from bzrlib.merge import merge
23
23
 
24
24
class TestRevisionNamespaces(TestCaseInTempDir):