diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-04-28 14:28:28 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-04-28 14:28:28 +0200 |
commit | cc60a7e656a16fe8a3994e5046858307bb236340 (patch) | |
tree | 577d2ebe920536f5f3c459390ddf4c673ab4f9b3 /cmds.py | |
parent | 240383e171768e53a1b27144a9e054ced4d8da10 (diff) | |
parent | 65baca4207268205e512f4ffde2413dd18b11fb2 (diff) | |
download | bzr-fastimport-cc60a7e656a16fe8a3994e5046858307bb236340.tar.gz |
Fix regression in command implementation of 'bzr fast-import' introduced in r310 and add a blackbox test to prevent future regressions.
Diffstat (limited to 'cmds.py')
-rw-r--r-- | cmds.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -309,8 +309,9 @@ class cmd_fast_import(Command): 'import-marks': import_marks, 'export-marks': export_marks, } - return _run(source, generic_processor.GenericProcessor, control=control, - params=params, verbose=verbose, user_map=user_map) + return _run(source, generic_processor.GenericProcessor, + bzrdir=control, params=params, verbose=verbose, + user_map=user_map) def _generate_info(self, source): from cStringIO import StringIO |