bzr-svn: Pushing existing BZR to new SVN repo.
Russel Winder
russel.winder at concertant.com
Mon Aug 17 07:46:42 BST 2009
Eric,
Jelmer is on vacation, so the definitive answer is some days away . . .
On Sun, 2009-08-16 at 00:44 -0700, Eric Berry wrote:
> 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.
I would probably do the following:
1. Create a shared repository.
2. Checkout a bound branch of the Subversion branch.
3. Branch the bound branch to create a working branch.
4. Merge your current branch into the new working branch.
5. Push from the working branch.
>
> I looked around the web for this and found a link to a non-existent
> page:
> http://samba.org/~jelmer/bzr-svn/FAQ.html
>
> Is there a new location for these faqs? Or could someone please send
> me the commands I need to use?
It looks like Jelmer has not updated this site for quite a while now --
the 0.4.x release is the latest mentioned, and that is fairly old now.
Clearly this part of his website needs either updating or removing.
--
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
London SW11 1EN, UK m: +44 7770 465 077 skype: russel_winder
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090817/442b4fc1/attachment.pgp
More information about the bazaar
mailing list