bzr-svn - Support for weird nested branching scheme?
Colin D Bennett
colin at gibibit.com
Fri Feb 27 21:29:16 GMT 2009
I'm using bzr-svn to mirror and work on a group project that is
primarily hosted on an svn server. It's working well, and here's the
layout on the svn server:
/trunk
/branches/version_1.0
/branches/version_2.0
/branches/version_3.0
This was working fine. But now a team member has branched
"/branches/version_3.0" into "/branches/version_3.0/Arc". Nasty! So
in my svn working copy of version_3.0, when I updated it, I got all the
Arc stuff too, since svn has no real concept of branches as opposed to
plain directories.
I have not pulled with bzr-svn since the /Arc nested branch was added
because I don't want to mess up my local bzr repo. What I would like is
a way to tell bzr-svn that "/branches/version_3.0/Arc" is a branch unto
itself and that it should not be included in the "version_3.0" branch,
but rather a new branch for "Arc" should be created in bzr for it.
Is this possible with the bzr-svn branching scheme configuration, or
can I write some Python code to handle it?
Also, I tried to do 'bzr branches' on the svn server, and it is not
working. Basically it is just saying "analyzing repository layout"
over and over forever:
$ bzr branches svn+https://[...]/svn/clever/branches
The svn+ syntax is deprecated, use [...]
[/ ] 4936kB @ 7kB/s | analyzing repository layout 65/65
So it has been running for about 10 minutes now, apparently just
downloading the same data over and over. There are only ~340 files in
each branch, only 5 branches, and only about 60 revisions in total in
the svn repository. So it shouldn't take long to get all the info that
"bzr branches" needs. Should "bzr branches" work on an svn repository?
EDIT: Actually, I tried "bzr branches" on the repository root,
"/svn/clever" instead of on the "branches" subdirectory, and it worked
right away! So perhaps bzr-svn should detect that I've given it the
wrong location and print an error. The output of 'bzr branches' is a
little weird in the formatting, where the first branch printed has
trailing garbage from the progress message (beginning with
"] 15kB @ 6kB/s"):
$ bzr branches svn+https://[...]/svn/clever
The svn+ syntax is deprecated, use https://[...]/svn/clever instead.
/branches/version_1.0] 15kB @ 6kB/s | browsing branches 3/4
/branches/version_3.0
/branches/version_2.0
/branches/decompilation
/trunk
$
Thanks for any help.
Regards,
Colin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090227/47efd0f8/attachment.pgp
More information about the bazaar
mailing list