Hi all, Trying to use bzr and launchpad, I bumped into a bunch of newbies questions... (I'm not sure any of them makes sens!)
Should I do bzr branch lp:inkscape like indicated on our inkscape launchpad web page? if yes, how are sourceforge svn rep and lp:inkscape related? lp:inkscape does not look like being uptodate. How do I commit to svn? (more over, this seems to break buildtool under windows, because of svninfo... but this is another story)
Should I use bzr-svn to checkout the sourceforge svn repository? hm. It's extremely slow. Can I still register my branches in launchpad then?
Am I missing a straight way to use my local svn tree to work with bzr?...
Anyway, some basic guide lines for newbies and ignorant people like me would be very helpfull ;-) Thanks. jfb.
On Tue, 2008-11-25 at 13:07 +0100, jf barraud wrote:
Should I do bzr branch lp:inkscape like indicated on our inkscape launchpad web page? if yes, how are sourceforge svn rep and lp:inkscape related? lp:inkscape does not look like being uptodate.
So the branch that is picked up there is the one that is built by the SVN Importer in Launchpad. Which is useful, but the problem is that it doesn't populate the data that bzr-svn needs to do it's job. It's confusing, I've complained, they're working on migrating over to using bzr-svn for everything.
The import takes a while with bzr-svn, but then you're done. You can grab my branch which is a bzr-svn branch which will help a little bit. It's here:
bzr branch lp:~ted-gould/inkscape/trunk
I think that should help some, but I'm not sure if bzr-svn still needs to build a separate cache or not.
How do I commit to svn?
If you're using a bzr-svn based import you can just push to it:
bzr push https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk
(more over, this seems to break buildtool under windows, because of svninfo... but this is another story)
I can't help there...
Should I use bzr-svn to checkout the sourceforge svn repository? hm. It's extremely slow.
Yeah, it's getting more data than is typically downloaded and the SF servers are less than ideal. What I do to compensate is create a local mirror in a shared repository. Kinda like this:
cd Development mkdir inkscape bzr init-repo --rich-root-pack inkscape cd inkscape bzr co https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk trunk cd trunk bzr bind https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk
Then if I want to create a branch to work on I do:
cd Development/inkscape bzr branch trunk mywork
And when I'm done with mywork:
cd Development/inkscape/trunk bzr merge ../mywork bzr commit -m "Lots of work"
And that re-uploads it to SVN automatically (because of the bind). To update trunk and my branch I do:
cd Development/inkscape/trunk bzr update cd Development/inkscape/mywork bzr merge ../trunk bzr commit -m "Merging from trunk"
Can I still register my branches in launchpad then?
Yes, any bzr branches can be on LP. Typically I have several. I use it as backup :)
--Ted
Thanks a lot!!
I branched from your trunk, bound it to central svn repository, and obtained a svn-aware branch from the central svn rep in a few minutes! I also created my experiemtal branch from that one. Every thing seems to work fine!
The next trouble (there is always one, right?) is when I want to commit *some* files only: I have some files in the root of the tree that are modified to fit my particular settings (like build.xml --- sorry, I'm under windows), and I don't want to commit them of course. This caused me bump into "Selected file commit of merges is not supported yet". I'm not sure I understand what it means (does the branch enter a particular state after a merge command? aren't merges definitely merged?), but I could not find a way to commit selected files only.
I think I'll keep my svn stuff to commit to svn for the moment, and use bzr for experimental branches, sharing in launchpad, and... learning bzr. Fortunately I usually don't touch so many files that merging by hand is a big issue ;-)
jfb.
2008/11/25 Ted Gould <ted@...11...>
On Tue, 2008-11-25 at 13:07 +0100, jf barraud wrote:
Should I do bzr branch lp:inkscape like indicated on our inkscape launchpad web page? if yes, how are sourceforge svn rep and lp:inkscape related? lp:inkscape does not look like being uptodate.
So the branch that is picked up there is the one that is built by the SVN Importer in Launchpad. Which is useful, but the problem is that it doesn't populate the data that bzr-svn needs to do it's job. It's confusing, I've complained, they're working on migrating over to using bzr-svn for everything.
The import takes a while with bzr-svn, but then you're done. You can grab my branch which is a bzr-svn branch which will help a little bit. It's here:
bzr branch lp:~ted-gould/inkscape/trunk
I think that should help some, but I'm not sure if bzr-svn still needs to build a separate cache or not.
How do I commit to svn?
If you're using a bzr-svn based import you can just push to it:
bzr push https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk
(more over, this seems to break buildtool under windows, because of svninfo... but this is another story)
I can't help there...
Should I use bzr-svn to checkout the sourceforge svn repository? hm. It's extremely slow.
Yeah, it's getting more data than is typically downloaded and the SF servers are less than ideal. What I do to compensate is create a local mirror in a shared repository. Kinda like this:
cd Development mkdir inkscape bzr init-repo --rich-root-pack inkscape cd inkscape bzr co https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk trunk cd trunk bzr bind https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk
Then if I want to create a branch to work on I do:
cd Development/inkscape bzr branch trunk mywork
And when I'm done with mywork:
cd Development/inkscape/trunk bzr merge ../mywork bzr commit -m "Lots of work"
And that re-uploads it to SVN automatically (because of the bind). To update trunk and my branch I do:
cd Development/inkscape/trunk bzr update cd Development/inkscape/mywork bzr merge ../trunk bzr commit -m "Merging from trunk"
Can I still register my branches in launchpad then?
Yes, any bzr branches can be on LP. Typically I have several. I use it as backup :)
--Ted
participants (2)
-
jf barraud -
Ted Gould