Rev 2371: [merge] Alexander Belchenko: forgotten import of TestSkipped in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/locking
John Arbash Meinel
john at arbash-meinel.com
Thu Mar 15 23:39:22 GMT 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/locking
------------------------------------------------------------
revno: 2371
revision-id: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
parent: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:39:05 -0500
message:
[merge] Alexander Belchenko: forgotten import of TestSkipped
modified:
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
------------------------------------------------------------
revno: 2369.1.1
merged: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: jam-locking-bialix
timestamp: Fri 2007-03-16 01:27:43 +0200
message:
forgotten import of TestSkipped
-------------- next part --------------
=== modified file 'bzrlib/tests/test_commit_merge.py'
--- a/bzrlib/tests/test_commit_merge.py 2007-03-11 22:15:59 +0000
+++ b/bzrlib/tests/test_commit_merge.py 2007-03-15 23:27:43 +0000
@@ -18,7 +18,10 @@
import os
import shutil
-from bzrlib.tests import TestCaseWithTransport
+from bzrlib.tests import (
+ TestCaseWithTransport,
+ TestSkipped,
+ )
from bzrlib.branch import Branch
from bzrlib.errors import PointlessCommit, BzrError
from bzrlib.tests.test_revision import make_branches
More information about the bazaar-commits
mailing list