[MERGE] submit branch support for bundle

[Erik Bågfors]

On 6/22/06, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi all,
>
> This patch adds the concept of submit branches to bzr.
>
> For any branch, a submit branch is the one its changes should be
> submitted to.  Thus, for my bzr.ab branch, the submit branch should be
> http://bazaar-vcs.org/bzr/bzr.dev/
>
> The submit branch may be different from the parent, because frequently
> branches are made from local branches, but are submitted elswhere, or
> perhaps using a different protocol.
>
> This patch implements support for the submit branch in
> 'bundle-revisions'.  I think it would also make sense to support it in
> 'pqm-submit' and it's also slated to be used in SubmitByEmail.
>
> Aaron
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.1 (GNU/Linux)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
>
> iD8DBQFEmr6Y0F+nu1YWqI0RAvUZAJ9cXwl1Ed+06rXsspw7Xc+cFMjckQCgg5Zu
> bZHhZ9jViNy813GIv8Lf7lI=
> =W+uX
> -----END PGP SIGNATURE-----


When I try to merge this, with a current bzr.dev (1804). I get

: [bagfors at zyrgelkwyt]$ ; ../bzr.dev/bzr merge ~/Desktop/bundle-submit.patch
bzr: ERROR: exceptions.TypeError: float() argument must be a string or a number

Traceback (most recent call last):
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/commands.py", line 692,
in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/commands.py", line 655, 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 2062, 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 69, in read_bundle
    return serializer.read(f)
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/serializer/v07.py",
line 96, in read
    return BundleReader(f).info
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/serializer/v07.py",
line 327, in __init__
    self._validate()
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/serializer/v07.py",
line 344, in _validate
    self.info.complete_info()
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/bundle_data.py",
line 130, in complete_info
    self.real_revisions.append(rev.as_revision())
  File "/home/bagfors/src/bzr/bzr.dev/bzrlib/bundle/bundle_data.py",
line 64, in as_revision
    timestamp=float(self.timestamp),
TypeError: float() argument must be a string or a number

bzr 0.9.0dev0 on python 2.4.3.final.0 (linux2)
arguments: ['../bzr.dev/bzr', 'merge',
'/home/bagfors/Desktop/bundle-submit.patch']

** please send this report to bazaar-ng at lists.ubuntu.com