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

[Eric Berry]

bzr import, sort of worked. I imported my local bzr branch into the local
bzr-svn branch.

Everything came in as being unknown. I then did a bzr add, and bzr ci. Which
failed.

All the directories were marked as in conflict. After I just resolved all of
them (1 by 1 - auto resolve wouldn't work), I could commit just fine.

bzr log only shows two entries, one for when I created the svn repo, and one
for the last commit.

bzr log --include-merges shows all the history.

I'm not sure how this was different than simply exporting my local bzr
branch into my bzr-svn branch though.

If I create a new bzr-svn branch of my new SVN repo, and do bzr log
--include-merges I only see two entries.

Think this is about as good as it'll get?

On Tue, Aug 18, 2009 at 11:15 PM, Eric Berry <elberry at gmail.com> wrote:

> Thanks Russel. I'll add the list back, and see if I find out any more info.
>
> Cheers, and thanks again!
> Eric
>
>
> On Tue, Aug 18, 2009 at 10:39 PM, Russel Winder <
> russel.winder at concertant.com> wrote:
>
>> Eric,
>> >
>> > Unfortunately not. This results in the previous error.
>> > bzr: ERROR: Branches have no common ancestor, and no merge base
>> > revision was specified.
>>
>> I think then that you may have to treat the original Bazaar branch as a
>> source of a foreign import.  I don't have the correct idiom to hand but
>> working by analogy with importing a Git or Mercurial repository, there
>> must be a way of importing a Bazaar repository.  Doing something with
>> fast-import should get all the content and history from the original
>> Bazaar branch into the current working branch that has been created by
>> branching from the Subversion repository mirror, then you can do the
>> push you have wanted to do for so long.
>>
>> People on the list might have the necessary idiom.
>> >
>> --
>> Russel.
>>
>> =============================================================================
>> Dr Russel Winder      Partner
>>                                            xmpp: russel at russel.org.uk
>> Concertant LLP        t: +44 20 7585 2200, +44 20 7193 9203
>> 41 Buckmaster Road,   f: +44 8700 516 084   voip:
>> sip:russel.winder at ekiga.net <sip%3Arussel.winder at ekiga.net>
>> London SW11 1EN, UK   m: +44 7770 465 077   skype: russel_winder
>>
>
>
>
> --
> Learn from the past. Live in the present. Plan for the future.
> 11101000
> http://www.townsfolkdesigns.com/blogs/elberry
>



-- 
Learn from the past. Live in the present. Plan for the future.
11101000
http://www.townsfolkdesigns.com/blogs/elberry
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090819/fb0dfeb1/attachment.htm