<br><br><div class="gmail_quote">On Sun, Aug 16, 2009 at 1:17 AM, Martin Pool <span dir="ltr"><<a href="mailto:mbp@canonical.com" target="_blank">mbp@canonical.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
2009/8/16 Eric Berry <<a href="mailto:elberry@gmail.com" target="_blank">elberry@gmail.com</a>>:<br>
<div>> Hello,<br>
> I have a local bzr branch which I need to store in svn as well. I've<br>
> already created a svn repo to house it, but when I try to push the branch to<br>
> svn, it says that the branches have diverged, and I need to merge. I can't<br>
> seem to figure out the right merge parameters, as I get an error specifying<br>
> that the two branches don't have a common ancestor, and none of the<br>
> revisions I use work.<br>
<br>
</div>Normally if there is no ancestry in common then doing<br>
<br>
bzr merge -r 0..<br>
<br>
will force it.</blockquote><div><br>I'm not quite sure where to do this from.<br><br>I've tried merging the svn repo into my local branch using -r 0. I've also tried checking out the svn repo locally, and merging my local bzr branch into it. Both result in a "nothing to do" message.<br>
<br>If I do the second one without the -r 0, I get this error:<br>bzr: ERROR: Prefix missing for branches/PluginDeveloper; please create it before pushing.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
<div><br>
> I looked around the web for this and found a link to a non-existent page:<br>
> <a href="http://samba.org/%7Ejelmer/bzr-svn/FAQ.html" target="_blank">http://samba.org/~jelmer/bzr-svn/FAQ.html</a><br>
><br>
> Is there a new location for these faqs? Or could someone please send me the<br>
> commands I need to use?<br>
<br>
</div>I don't know, sorry.<br>
<br>
There are questions in <a href="https://answers.edge.launchpad.net/bzr-svn" target="_blank">https://answers.edge.launchpad.net/bthoughzr-svn</a> but no faqs.<font color="#888888"></font></blockquote><div><br>Thank you for the link. I found this question there:<br>
<a href="https://answers.edge.launchpad.net/bzr-svn/+question/9223">https://answers.edge.launchpad.net/bzr-svn/+question/9223</a><br><br>And it seems that the bzr-svn plugin should be able to do this now, so I must be doing something wrong. <br>
</div></div><br><br clear="all"><br>-- <br>Learn from the past. Live in the present. Plan for the future.<br>11101000<br><a href="http://www.townsfolkdesigns.com/blogs/elberry" target="_blank">http://www.townsfolkdesigns.com/blogs/elberry</a><br>