[MERGE] Some small fixes for bzr-hg

Erik Bågfors zindar at gmail.com
Sun Jul 16 14:00:57 BST 2006

On 7/15/06, Jelmer Vernooij <jelmer at samba.org> wrote:
> Hi Robert,
> I'm seeking a +1 on the following changes to bzr-hg:
>  * Add a few stubs to make 'bzr check' and 'bzr info' happy.
>  * Ignore *.pyc files.
>  * Add setup script.
> Bundle attached.

FYI, I get problems merging this with the latest bzr.dev (revno 1865).
I thought this problems with bundles was solved?

Thanks to the fact that bundles are just diffs, I could use patch to apply it :)

: [bagfors at zyrgelkwyt]$ ; bzr  merge ~/Desktop/bzr-hg-fixes.diff
Unable to load plugin 'bzr-git' from '/home/bagfors/.bazaar/plugins'
bzr: ERROR: bzrlib.errors.MalformedHeader:

Traceback (most recent call last):
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/commands.py", line 697,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/commands.py", line 659, in run_bzr
    ret = run(*run_argv)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/commands.py", line 281,
in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/builtins.py", line 2112, in run
    reader = bundle.read_bundle_from_url(branch)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/__init__.py", line
41, in read_bundle_from_url
    return read_bundle(f)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/serializer/__init__.py",
line 56, in read_bundle
    raise errors.MalformedHeader()


More information about the bazaar mailing list