[Bug 673344] Re: bzr crashed when attempting to merge a Bazaar merge directive format 2 without target_branch

[Jelmer Vernooij]

** Changed in: bzr
       Status: Confirmed => Fix Released

** Changed in: bzr (Ubuntu)
       Status: Triaged => Fix Released

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to bzr in Ubuntu.
https://bugs.launchpad.net/bugs/673344

Title:
  bzr crashed when attempting to merge a Bazaar merge directive format 2
  without target_branch

Status in Bazaar:
  Fix Released
Status in bzr package in Ubuntu:
  Fix Released

Bug description:
  Binary package hint: bzr

  When attempting to merge a merge-directive, Bazaar crashes with
  "TypeError: __init__() takes at least 6 non-keyword arguments (5
  given)". This appears to be caused by the merge directive missing a
  target_branch which is expected by the MergeDirective2 class.

  # Bazaar merge directive format 2 (Bazaar 0.90)
  # revision_id: matt.giuca at gmail.com-20101110013211-nnygvxzgf7d8ztug
  # testament_sha1: f6ec130f0a3b31bcb1368160afb40632cf953863
  # timestamp: 2010-11-10 12:35:36 +1100
  # base_revision_id: coles.david at gmail.com-20101109044736-\
  #   mf2vov0kvwdrf5n5
  #
  # Begin patch

  I'm unsure if this is a bug in my version of Bazaar (for crashing when
  not explicitly given a target_branch) or the other user's version of
  Bazaar (for not adding a target_branch to the merge request).

  ProblemType: Crash
  DistroRelease: Ubuntu 10.10
  Package: bzr 2.2.1-0ubuntu1
  ProcCmdline: /usr/bin/python /usr/bin/bzr merge /tmp/highlight-20.patch

  Traceback (most recent call last):
    File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 912, in exception_to_return_code
      return the_callable(*args, **kwargs)
    File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1112, in run_bzr
      ret = run(*run_argv)
    File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 690, in run_argv_aliases
      return self.run(**all_cmd_args)
    File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 705, in run
      return self._operation.run_simple(*args, **kwargs)
    File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 135, in run_simple
      self.cleanups, self.func, *args, **kwargs)
    File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
      result = func(*args, **kwargs)
    File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3831, in run
      possible_transports=possible_transports)
    File "/usr/lib/python2.6/dist-packages/bzrlib/bundle/__init__.py", line 52, in read_mergeable_from_url
      _do_directive)
    File "/usr/lib/python2.6/dist-packages/bzrlib/bundle/__init__.py", line 89, in read_mergeable_from_transport
      return MergeDirective.from_lines(bytef), transport
    File "/usr/lib/python2.6/dist-packages/bzrlib/merge_directive.py", line 416, in from_lines
      line_iter)
    File "/usr/lib/python2.6/dist-packages/bzrlib/merge_directive.py", line 540, in _from_lines
      **kwargs)
  TypeError: __init__() takes at least 6 non-keyword arguments (5 given)

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/673344/+subscriptions