convert: fix the RevisionSpec import in the bzr module
authorSaurabh Singh <singhsrb@fb.com>
Thu, 05 Oct 2017 00:48:44 +0000
changeset 34488 6bda8a9d8431
parent 34487 323bed58cf57
child 34489 270e344a6c74
convert: fix the RevisionSpec import in the bzr module This import was failing (because its invalid) which was resulting in the following tests failing with chg running: - test-convert-bzr.t - test-convert-bzr-directories.t - test-convert-bzr-ghosts.t - test-convert-bzr-treeroot.t - test-convert-bzr-114.t - test-convert-bzr-merges.t This commit fixes the import which in turn fixes the tests. Test Plan: Ran the aforementioned tests with and without '--chg' option. Differential Revision: https://phab.mercurial-scm.org/D936
hgext/convert/bzr.py
--- a/hgext/convert/bzr.py	Thu Oct 05 15:12:11 2017 -0400
+++ b/hgext/convert/bzr.py	Thu Oct 05 00:48:44 2017 +0000
@@ -30,11 +30,12 @@
     import bzrlib.bzrdir
     import bzrlib.errors
     import bzrlib.revision
-    import bzrlib.revisionspec.RevisionSpec
+    import bzrlib.revisionspec
     bzrdir = bzrlib.bzrdir
     errors = bzrlib.errors
     revision = bzrlib.revision
     revisionspec = bzrlib.revisionspec
+    revisionspec.RevisionSpec
 except ImportError:
     pass