Ah. My apologies, I missed that. When I use -r 0.. I get this message: /Library/Python/2.5/site-packages/bzrlib/repository.py:2356: DeprecationWarning: NULL_REVISION should be used for the null revision instead of None, as of bzr 0.91. revision_id = _mod_revision.ensure_null(revision_id) All changes applied successfully. However, there is nothing in the bzr-svn checkout. I also tried creating a bzr branch of the bzr-svn checkout, and then merging using -r 0.. with the same results. If I try to do a merge (without the -r 0..), I get the previous error about having no common ancestor. <div class="gmail_quote">On Wed, Aug 19, 2009 at 3:15 AM, Tom Widmer <<a href="mailto:tom.widmer@gmail.com">tom.widmer@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Eric Berry wrote: <blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> On Sun, Aug 16, 2009 at 1:17 AM, Martin Pool <<a href="mailto:mbp@canonical.com" target="_blank">mbp@canonical.com</a> <mailto:<a href="mailto:mbp@canonical.com" target="_blank">mbp@canonical.com</a>>> wrote: 2009/8/16 Eric Berry <<a href="mailto:elberry@gmail.com" target="_blank">elberry@gmail.com</a> <mailto:<a href="mailto:elberry@gmail.com" target="_blank">elberry@gmail.com</a>>>:<div class="im"> > 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. 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. If I do the second one without the -r 0, I get this error: bzr: ERROR: Prefix missing for branches/PluginDeveloper; please create it before pushing. </div></blockquote> <div class="im"> You don't literally mean -r 0 do you? Martin said -r 0.. </div> The .. is important (it means 0 onwards, not just 0, which would be a no-op). Tom </blockquote></div> -- Learn from the past. Live in the present. Plan for the future. 11101000 <a href="http://www.townsfolkdesigns.com/blogs/elberry">http://www.townsfolkdesigns.com/blogs/elberry</a>