← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Alexander Belchenko
  • Date: 2007-03-15 23:27:43 UTC
  • mto: (2353.4.10 locking)
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: bialix@ukr.net-20070315232743-ol8q5vyqzpvdkrjy
forgotten import of TestSkipped

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
18
18
import os
19
19
import shutil
20
20
 
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.tests import (
 
22
    TestCaseWithTransport,
 
23
    TestSkipped,
 
24
    )
22
25
from bzrlib.branch import Branch
23
26
from bzrlib.errors import PointlessCommit, BzrError
24
27
from bzrlib.tests.test_revision import make_branches