Bazaar can't push!

[LunarSwift]

When trying to push my branch (using a saved location), I got an error (claiming it's possibly a bug in Bazaar).

---
C:\>bzr push
Using saved push location: C:/Users/xxx/Dropbox/xxx/
bzr: ERROR: bzrlib.errors.MalformedTransform: Tree transform is malformed [('unversioned parent', 'new-3'), ('versioning no contents', 'new-6')]

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 920, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1131, in run_bzr
  File "bzrlib\commands.pyo", line 673, in run_argv_aliases
  File "bzrlib\commands.pyo", line 695, in run
  File "bzrlib\cleanup.pyo", line 136, in run_simple
  File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
  File "bzrlib\builtins.pyo", line 1379, in run
  File "bzrlib\push.pyo", line 145, in _show_push_branch
  File "bzrlib\controldir.pyo", line 436, in push_branch
  File "bzrlib\workingtree.pyo", line 1435, in update
  File "bzrlib\mutabletree.pyo", line 52, in tree_write_locked
  File "bzrlib\workingtree.pyo", line 1505, in _update_tree
  File "bzrlib\merge.pyo", line 2021, in merge_inner
  File "bzrlib\merge.pyo", line 686, in do_merge
  File "bzrlib\cleanup.pyo", line 136, in run_simple
  File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
  File "bzrlib\merge.pyo", line 654, in _do_merge_to
  File "bzrlib\merge.pyo", line 802, in do_merge
  File "bzrlib\cleanup.pyo", line 132, in run
  File "bzrlib\cleanup.pyo", line 166, in _do_with_cleanups
  File "bzrlib\merge.pyo", line 807, in _do_merge
  File "bzrlib\merge.pyo", line 857, in _compute_transform
  File "bzrlib\merge.pyo", line 867, in _finish_computing_transform
  File "bzrlib\transform.pyo", line 3033, in resolve_conflicts
MalformedTransform: Tree transform is malformed [('unversioned parent', 'new-3'), ('versioning no contents', 'new-6')]

bzr 2.5.1 on python 2.6.6 (Windows-post2008Server-6.2.9200)
arguments: ['bzr', 'push']
plugins: bzrtools[2.5.0], changelog_merge[2.5.1], colo[0.4.0],
    explorer[1.2.2], fastimport[0.14.0dev], git[0.6.8], launchpad[2.5.1],
    loom[2.3.0dev], netrc_credential_store[2.5.1], news_merge[2.5.1],
    pipeline[1.4.0], qbzr[0.22.3], rewrite[0.6.4dev], svn[1.2.2],
    upload[1.2.0dev], xmloutput[0.8.8]
encoding: 'cp1252', fsenc: 'mbcs', lang: None

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.