Comment 13 for bug 125751

Hi

Thanks for your quick reply. I figured as much out on the train, but sadly that change leads to:

bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 817, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 779, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 477, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 808, in run
    push_result = br_from.push(tree_to.branch, overwrite)
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1556, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1585, in _push_with_bound_branches
    self._basic_push(master_branch, overwrite, stop_revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1617, in _basic_push
    target.update_revisions(self, stop_revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/branch.py", line 356, in update_revisions
    push(self, other, revid)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/commit.py", line 675, in push
    builder.commit(rev.message)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/commit.py", line 472, in commit
    assert self._new_revision_id is None or self._new_revision_id == revid
AssertionError

bzr 0.90.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'push']

** please send this report to <email address hidden>

bzr missing gives:

You have 2 extra revision(s):
------------------------------------------------------------
revno: 3
committer: John Carr <john@ichigo>
branch nick: bzr-branch
timestamp: Sat 2007-09-15 17:24:24 +0100
message:
  Merge with mothership
------------------------------------------------------------
revno: 2
committer: John Carr <john@ichigo>
branch nick: bzr-branch
timestamp: Sat 2007-09-15 17:24:23 +0100
message:
  Add some stuff