pushing on top of non-lhs parent fails

[James Y Knight]

I'm using the latest version of the http://people.samba.org/bzr/jelmer/bzr-svn/0.4/ branch.

#!/bin/sh
set -e
set -x

mkdir test-bzr-svn
cd test-bzr-svn

BASE=$PWD

# Create SVN repository
svnadmin create svnrepo
svn co file://$BASE/svnrepo/ svn
cd svn
echo "asdf" > foo
svn add foo
svn ci -m "first commit"

# Make a branch in BZR, and commit stuff to it:
cd $BASE
bzr branch file://$BASE/svnrepo bzr
cd bzr
echo "sdfg" >> foo
bzr add foo
bzr ci -m "bzr add to foo"
cd ..

# Make a commit in svn.
cd $BASE/svn
echo "newfile!" > newfile
svn add newfile
svn ci -m "added newfile with svn"

cd $BASE/bzr
bzr merge file://$BASE/svnrepo/
bzr ci -m "Merge from svn"
# THIS FAILS with error:
# bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
bzr push file://$BASE/svnrepo/

[Jelmer Vernooij (jelmer)]

Thanks for the detailed bug report.

  summary "pushing on top of non-lhs parent fails"
  status triaged
  importance high
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

[Jelmer Vernooij (jelmer)]

  status fixcommitted
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>