dpush can't handle merges

Bug #329284 reported by Luke-Jr
2
Affects Status Importance Assigned to Milestone
Bazaar
Invalid
Undecided
Unassigned
Bazaar Subversion Plugin
Fix Released
Undecided
Jelmer Vernooij

Bug Description

This happens after I resolve "diverged" branches with 'bzr merge' and 'bzr commit'.

$ bzr dpush svn+https://svn.corp.com/svn/project
The svn+ syntax is deprecated, use https://svn.corp.com/svn/project instead.
bzr: ERROR: exceptions.TypeError: 'NoneType' object is not iterable

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 893, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 839, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 539, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "//usr/lib/python2.5/site-packages/bzrlib/plugins/svn/foreign/__init__.py", line 122, in run
    revid_map = target_branch.dpull(source_branch)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "//usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py", line 393, in dpull
    return dpush(self, source, stop_revision)
  File "//usr/lib/python2.5/site-packages/bzrlib/plugins/svn/commit.py", line 1001, in dpush
    for revid in todo:
TypeError: 'NoneType' object is not iterable

bzr 1.11 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'dpush', 'svn+https://svn.corp.com/svn/project']
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: None
plugins:
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [unknown]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.5]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

Jelmer Vernooij (jelmer)
Changed in bzr:
status: New → Invalid
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
assignee: nobody → jelmer
milestone: none → 0.5.1
status: New → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.