Comment 4 for bug 515850

It seems I was a little hasty to say that tweaking bzr:base-revision manually fixes it. Checking out a bound branch after doing this gives me a branch with history that appears correct but that I can't commit to; it complains that my branch is out of date but running bzr up gives me no more revisions.

lem:qt4-trunk % bzr up && bzr ci -v -Derror -m 'Trac #1608'
Tree is up to date at revision 14408.
bzr: ERROR: bzrlib.errors.BzrCommandError: Bound branch BzrBranch7('file:///home/giddens/Source/Terminal/qt4-trunk/') is out of date with master branch SvnBranch('http://host/svn/tux-svn/Terminal/branches/Qt4_trunk').
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.

Traceback (most recent call last):
  File "/home/giddens/Source/bzr/2.0-with-ghost-diffs/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/giddens/Source/bzr/2.0-with-ghost-diffs/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/home/giddens/Source/bzr/2.0-with-ghost-diffs/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/giddens/Source/bzr/2.0-with-ghost-diffs/bzrlib/builtins.py", line 3072, in run
    raise errors.BzrCommandError(str(e) + "\n"
BzrCommandError: Bound branch BzrBranch7('file:///home/giddens/Source/Terminal/qt4-trunk/') is out of date with master branch SvnBranch('http://host/svn/tux-svn/Terminal/branches/Qt4_trunk').
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.