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

Bug #301763 reported by Wouter van Heyst
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Fix Released
Jelmer Vernooij

Bug Description

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/", line 893, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/wouter/src/bzr/", line 839, in run_bzr
    ret = run(*run_argv)
  File "/home/wouter/src/bzr/", line 539, in run_argv_aliases
  File "/home/wouter/.bazaar/plugins/dev/svn/", line 421, in run
  File "/home/wouter/.bazaar/plugins/dev/svn/", line 145, in import_branch
  File "/home/wouter/.bazaar/plugins/dev/svn/", 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/", line 831, in push
  File "/home/wouter/.bazaar/plugins/dev/svn/", line 787, in push_revision_tree
    revid = builder.commit(rev.message)
  File "/home/wouter/.bazaar/plugins/dev/svn/", line 570, in commit
    assert not self.push_metadata or self._new_revision_id is None or self._new_revision_id == revid

bzr 1.10dev on python 2.5.2 (linux2)
arguments: ['/home/wouter/src/bzr/', 'svn-push', 'file:///home/wouter/tmp/kmx/branches/spitfire/spitfire4']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
  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 []
  launchpad /home/wouter/src/bzr/ [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
    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.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Can you perhaps print the variables in that assert?

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

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

Changed in bzr-svn:
assignee: nobody → jelmer
importance: Undecided → Medium
status: New → Triaged
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
milestone: none → 0.5.0
status: Triaged → 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.