Comment 5 for bug 515850

Yeah, I think the local and remote repository now disagree about the
state of your repository.

bzr-svn should've aborted halfway through pushing when it saw the commit
from the other person and printed a "Out of date" error.

The best workaround at this point is to throw away your local checkout
and create a new checkout - this should have the "correct" history.

Unfortunately this'll be hard to reproduce or test in the testsuite :(

  status triaged
  importance high