← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Robert Collins
  • Date: 2005-10-02 21:51:29 UTC
  • mfrom: (1396)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20051002215128-5686c7d24bf9bdb9
merge from martins newformat branch - brings in transport abstraction

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
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):