diff options
| -rw-r--r-- | cmds.py | 2 | ||||
| -rw-r--r-- | tests/test_commands.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -310,7 +310,7 @@ class cmd_fast_import(Command): 'export-marks': export_marks, } return _run(source, generic_processor.GenericProcessor, - control=control, params=params, verbose=verbose, + bzrdir=control, params=params, verbose=verbose, user_map=user_map) def _generate_info(self, source): diff --git a/tests/test_commands.py b/tests/test_commands.py index f003f03..c817a8a 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -134,4 +134,4 @@ class TestFastImport(ExternalBase): tree = self.make_branch_and_tree("br") self.build_tree_contents([('file.fi', simple_fast_import_stream)]) data = self.run_bzr("fast-import file.fi br")[0] - self.assertEquals(3, tree.branch.revno()) + self.assertEquals(1, tree.branch.revno()) |