bzr-svn: Pushing existing BZR to new SVN repo.

Tom Widmer tom.widmer at gmail.com
Wed Aug 19 11:07:22 BST 2009


Eric Berry wrote:
> 
> 
> On Sun, Aug 16, 2009 at 1:17 AM, Martin Pool <mbp at canonical.com 
> <mailto:mbp at canonical.com>> wrote:
> 
>     2009/8/16 Eric Berry <elberry at gmail.com <mailto:elberry at gmail.com>>:
>      > Hello,
>      >     I have a local bzr branch which I need to store in svn as
>     well. I've
>      > already created a svn repo to house it, but when I try to push
>     the branch to
>      > svn, it says that the branches have diverged, and I need to
>     merge. I can't
>      > seem to figure out the right merge parameters, as I get an error
>     specifying
>      > that the two branches don't have a common ancestor, and none of the
>      > revisions I use work.
> 
>     Normally if there is no ancestry in common then doing
> 
>      bzr merge -r 0..
> 
>     will force it.
> 
> 
> I'm not quite sure where to do this from.
> 
> I've tried merging the svn repo into my local branch using -r 0. 

You don't literally mean -r 0 do you? Martin said -r 0..
The .. is important (it means 0 onwards, not just 0).

Tom




More information about the bazaar mailing list