Problem with baz-import

[Matthieu Moy]

Don't know whether this is a known bug:

$ bzr baz-import . Matthieu.Moy at imag.fr--public/dvc--main--0
Cleaning up
bzr: ERROR: exceptions.AttributeError: 'module' object has no
attribute 'merge'
  at /home/moy/.bazaar/plugins/bzrtools/baz_import.py line 331
  in import_version

~/.bzr.log says:

Traceback (most recent call last):
  File "/net/ecrins/local/moy/usr/src/bzr.dev/bzrlib/commands.py", line 572, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/net/ecrins/local/moy/usr/src/bzr.dev/bzrlib/commands.py", line 534, in run_bzr
    ret = cmd_obj.run_argv(argv)
  File "/net/ecrins/local/moy/usr/src/bzr.dev/bzrlib/commands.py", line 233, in run_argv
    return self.run(**all_cmd_args)
  File "/home/moy/.bazaar/plugins/bzrtools/baz_import.py", line 576, in run
    import_version(to_location, from_branch)
  File "/home/moy/.bazaar/plugins/bzrtools/baz_import.py", line 331, in import_version
    bzrlib.merge.merge((output_dir, -1), (output_dir, old_revno),
AttributeError: 'module' object has no attribute 'merge'

return code 3


Using up-to-date bzr and bzrtools.

-- 
Matthieu