dpush can't handle merges
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:/
The svn+ syntax is deprecated, use https:/
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "//usr/
revid_map = target_
File "/usr/lib/
result = unbound(self, *args, **kwargs)
File "//usr/
return dpush(self, source, stop_revision)
File "//usr/
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:/
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: None
plugins:
launchpad /usr/lib/
netrc_
svn /usr/lib/
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.
Changed in bzr: | |
status: | New → Invalid |
Changed in bzr-svn: | |
assignee: | nobody → jelmer |
milestone: | none → 0.5.1 |
status: | New → Fix Released |