commit fails with "AssertionError: revprops: ..."

[Michael Gratton]

One of the branches that was previously affected by bug #300006 is now throwing an assertion error when committing, so it migth be related. Not a public repo, sorry.

This is using bzr 1.10 and bzr-svn 0.5-rc, svn 1.5 client libs, but against a svn 1.4 server, so "self.supports_custom_revprops" is False.

Error output:

bzr: ERROR: exceptions.AssertionError: revprops: ['bzr:revision-id', 'bzr:user-agent', 'bzr:timestamp', 'bzr:root', 'bzr:committer', 'svn:log', 'bzr:revprop:branch-nick', 'bzr:file-ids', 'bzr:base-revision', 'bzr:revno', 'bzr:mapping-version', 'bzr:text-parents']

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/builtins.py", line 2435, in run
    exclude=safe_relpath_files(tree, exclude))
  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/workingtree_4.py", line 235, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  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/mutabletree.py", line 202, in commit
    *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 404, in commit
    revision_id=self.rev_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1021, in fetch
    find_ghosts=find_ghosts)
  File "/home/michael.gratton/.bazaar/plugins/svn/commit.py", line 1068, in fetch
    self.copy_content(revision_id=revision_id, pb=pb)
  File "/home/michael.gratton/.bazaar/plugins/svn/commit.py", line 1061, in copy_content
    append_revisions_only=target_branch._get_append_revisions_only())
  File "/home/michael.gratton/.bazaar/plugins/svn/commit.py", line 944, in push_revision_tree
    revid = builder.commit(rev.message)
  File "/home/michael.gratton/.bazaar/plugins/svn/commit.py", line 591, in commit
    "revprops: %r" % self._svn_revprops.keys()
AssertionError: revprops: ['bzr:revision-id', 'bzr:user-agent', 'bzr:timestamp', 'bzr:root', 'bzr:committer', 'svn:log', 'bzr:revprop:branch-nick', 'bzr:file-ids', 'bzr:base-revision', 'bzr:revno', 'bzr:mapping-version', 'bzr:text-parents']

bzr 1.10 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'commit', '-F', '.tmp-bzr-log-edit.txt']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_AU.UTF-8'
plugins:
  bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.10]
  gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.95.0.final.1]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.3]
  svn /home/michael.gratton/.bazaar/plugins/svn [0.5.0.rc.1]
  xmloutput /usr/lib/python2.5/site-packages/bzrlib/plugins/xmloutput [0.8]

[Jelmer Vernooij (jelmer)]

Thanks for the bug report. This has been fixed in the 0.5 branch.

[Michael Gratton (mjog)]

Ah, yes it has. Thanks.