svn-push to a new branch in svn trips assert in commit

[Wouter van Heyst]

In an attempt to first store the diverged revisions in an svn branch before merging that into the trunk, I thought to use svn-push repo/branches/<no-branch-yet> , however, this fails.

The traceback below is on copy of the actual repo to prevent further messing up.

bzr svn-push file:///home/wouter/tmp/kmx/branches/spitfire/spitfire4
bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 893, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 839, in run_bzr
    ret = run(*run_argv)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 539, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/wouter/.bazaar/plugins/dev/svn/__init__.py", line 421, in run
    _override_svn_revprops=override_svn_revprops)
  File "/home/wouter/.bazaar/plugins/dev/svn/remote.py", line 145, in import_branch
    override_svn_revprops=_override_svn_revprops)
  File "/home/wouter/.bazaar/plugins/dev/svn/commit.py", line 721, in push_new
    push(target_repository.get_graph(), ImaginaryBranch(target_repository), source, start_revid, push_metadata=push_metadata, override_svn_revprops=override_svn_revprops)
  File "/home/wouter/.bazaar/plugins/dev/svn/commit.py", line 831, in push
    override_svn_revprops=override_svn_revprops)
  File "/home/wouter/.bazaar/plugins/dev/svn/commit.py", line 787, in push_revision_tree
    revid = builder.commit(rev.message)
  File "/home/wouter/.bazaar/plugins/dev/svn/commit.py", line 570, in commit
    assert not self.push_metadata or self._new_revision_id is None or self._new_revision_id == revid
AssertionError

bzr 1.10dev on python 2.5.2 (linux2)
arguments: ['/home/wouter/src/bzr/bzr.dev/bzr', 'svn-push', 'file:///home/wouter/tmp/kmx/branches/spitfire/spitfire4']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  bzrtools /home/wouter/.bazaar/plugins/dev/bzrtools [1.9]
  dbus /usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [unknown]
  gtk /home/wouter/.bazaar/plugins/dev/gtk [0.96.0.dev.1]
  launchpad /home/wouter/src/bzr/bzr.dev/bzrlib/plugins/launchpad [unknown]
  qbzr /home/wouter/.bazaar/plugins/dev/qbzr [0.9.5dev]
  rebase /home/wouter/.bazaar/plugins/dev/rebase [0.4.1]
  svn /home/wouter/.bazaar/plugins/dev/svn [0.4.16dev]
  upload /home/wouter/.bazaar/plugins/dev/upload [0.1]
  vimdiff /home/wouter/.bazaar/plugins/dev/vimdiff [unknown]
*** 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.

After this, svn log --stop-on-copy on the spitfire4 branch mentions:

r7745 | wouter | 2008-11-24 18:40:44 +0100 (Mon, 24 Nov 2008) | 1 line

Add doxyfile for spitfire.
---------------------------------------------------------------------------------------------

Which is the first commit after diverging from trunk.

[Jelmer Vernooij (jelmer)]

Can you perhaps print the variables in that assert?

[Jelmer Vernooij (jelmer)]

Can you reproduce this or was it a one-time error?