5 seconds? Really? It takes 50-70 seconds for me even with a local branch. Just copying a clean branch with cp -r takes <1s. That's my main reason to like git over bzr, fast in-place branching.
I have run bzr init . here before checking out: martinal@martinal-mac:~/dev/fenics/dolfin$ ls .bzr branch branch-format branch-lock checkout README repository martinal@martinal-mac:~/dev/fenics/dolfin$ time bzr branch trunk clean2 Branched 7208 revisions. real 1m11.411s user 1m8.604s sys 0m0.936s martinal@martinal-mac:~/dev/fenics/dolfin$ time bzr branch clean2 clean3 Branched 7208 revisions. real 0m48.138s user 0m46.095s sys 0m0.860s martinal@martinal-mac:~/dev/fenics/dolfin$ time bzr branch clean2 clean4 Branched 7208 revisions. real 0m47.832s user 0m46.063s sys 0m0.752s On 6 December 2012 10:41, Anders Logg <l...@simula.no> wrote: > On Thu, Dec 06, 2012 at 09:26:09AM +0000, Garth N. Wells wrote: > > On Thu, Dec 6, 2012 at 9:20 AM, Anders Logg <l...@simula.no> wrote: > > > bzr branch lp:dolfin clean > > > cd clean > > > bzr merge ../<path-to-complexly-merged-branch> > > > bzr commit > > > bzr push lp:dolfin > > > > > > > The 'clean' branch is not necessarily clean, which then requires > > branching lp:dolfin, which is huge. > > How can it not be clean? If you already have a 'clean' branch, then > > rm -r clean > bzr branch lp:dolfin clean # takes ~5 seconds if you've use init-repo > > I don't see how this branch can be anything else than clean. > > -- > Anders > > > > > > Garth > > > > > > > > > > > On Wed, Dec 05, 2012 at 09:10:47PM +0000, Garth N. Wells wrote: > > >> So how do I push code after a complex series of merges? Now it just > hangs. > > >> > > >> Garth > > >> > > >> On Wed, Dec 5, 2012 at 11:20 AM, Anders Logg <l...@simula.no> wrote: > > >> > It looks like the way to set that flag has changed on Launchpad. The > > >> > old method using sftp does not seem to work anymore. > > >> > > > >> > Instead, I tried the following: > > >> > > > >> > bzr config -d > > >> > bzr+ssh://bazaar.launchpad.net/+branch/dolfin/append_revisions_only=true > > >> > > > >> > This command runs fine and makes it easy to turn the flag on/off > > >> > without needing to do all the work with sftp and uploading config > > >> > files. > > >> > > > >> > However, what happens when one tries to push with that flag set is > > >> > that one does not get an error message but instead a timeout and the > > >> > following error after 5 mins: > > >> > > > >> > Connection Timeout: disconnecting client after 300.0 seconds > > >> > ConnectionReset reading response for > 'Branch.set_last_revision_info', > > >> > retrying > > >> > > > >> > > > >> > > > >> > On Wed, Dec 05, 2012 at 01:35:47AM +0100, Anders Logg wrote: > > >> >> On Tue, Dec 04, 2012 at 10:06:58PM +0000, Garth N. Wells wrote: > > >> >> > On Tue, Dec 4, 2012 at 2:39 PM, Anders Logg <l...@simula.no> > wrote: > > >> >> > > Garth, could you live with setting the append_revisions_only > flag? > > >> >> > > At least for now. > > >> >> > > > > >> >> > > > >> >> > Yes, if someone can tell me how to get a clean branch without > pulling > > >> >> > 100MB over the Internet. > > >> >> > > >> >> This should work: > > >> >> > > >> >> Do this once: > > >> >> > > >> >> bzr init-repo dolfin > > >> >> > > >> >> Then enter that directory and branch at least one of your branches > > >> >> into that directory. This works automatically if you use that > > >> >> directory for normal development work (in branches/subdirectories). > > >> >> > > >> >> Then all you need to do is > > >> >> > > >> >> bzr branch lp:dolfin clean > > >> >> > > >> >> It takes 5.5 seconds for me on a moderately slow connection > (5Mbit). > > >> >> >
_______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
