Can't mirror a branch to SVN

[Alex Smith]

I'd like to mirror my Bazaar branch to SVN to use with Ohloh, but I can't. This is what I'm getting:

[12:45:30] [ alex in ~/src/exclaim/svn ] $ svnadmin create --fs-type fsfs svn-trunk
[12:45:38] [ alex in ~/src/exclaim/svn ] $ bzr branch ../trunk/
Branched 455 revision(s).
[12:45:49] [ alex in ~/src/exclaim/svn ] $ cd trunk/
[12:45:51] [ alex in ~/src/exclaim/svn/trunk ] $ bzr push file:///home/alex/src/exclaim/svn/svn-trunk/
bzr: ERROR: These branches have diverged. Try using "merge" and then "push".

I'm using bzr 0.90 and bzr-svn 0.4.1. Is this something that I'm doing wrong?

[Jelmer Vernooij (jelmer)]

Hi,

Am Montag, den 03.09.2007, 11:49 +0000 schrieb Alex Smith:
> I'd like to mirror my Bazaar branch to SVN to use with Ohloh, but I
> can't. This is what I'm getting:
>
> [12:45:30] [ alex in ~/src/exclaim/svn ] $ svnadmin create --fs-type fsfs svn-trunk
> [12:45:38] [ alex in ~/src/exclaim/svn ] $ bzr branch ../trunk/
> Branched 455 revision(s).
> [12:45:49] [ alex in ~/src/exclaim/svn ] $ cd trunk/
> [12:45:51] [ alex in ~/src/exclaim/svn/trunk ] $ bzr push file:///home/alex/src/exclaim/svn/svn-trunk/
> bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
>
> I'm using bzr 0.90 and bzr-svn 0.4.1. Is this something that I'm doing
> wrong?
Creating a new branch using 'bzr push' isn't supported yet in 0.4.1.
There is a custom command 'bzr svn-push' that does support creating new
branches. Eventually I hope to integrate that functionality into the
'bzr push' command and get rid of svn-push.

Cheers,

Jelmer

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

[Alex Smith (aejsmith)]

I just tried svn-push, and I get exactly the same:

[07:47:17] [ alex in ~/src/exclaim/svn/trunk ] $ svnadmin create --fs-type fsfs ../svn-trunk
[07:47:27] [ alex in ~/src/exclaim/svn/trunk ] $ bzr svn-push ../svn-trunk/
bzr: ERROR: These branches have diverged. Use the merge command to reconcile them.

[Jelmer Vernooij (jelmer)]

Am Dienstag, den 04.09.2007, 06:48 +0000 schrieb Alex Smith:
> *** This bug is a duplicate of bug 127945 ***
> https://bugs.launchpad.net/bugs/127945
>
> I just tried svn-push, and I get exactly the same:
>
> [07:47:17] [ alex in ~/src/exclaim/svn/trunk ] $ svnadmin create --fs-type fsfs ../svn-trunk
> [07:47:27] [ alex in ~/src/exclaim/svn/trunk ] $ bzr svn-push ../svn-trunk/
> bzr: ERROR: These branches have diverged. Use the merge command to reconcile them.
../svn-trunk/ is a path that already exists and which has a history of its own (that diverges from the history of the branch you're trying to push). Pushing to a new branch, for example ../svn-trunk/trunk, should work ok.

Cheers,

Jelmer

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