dolfin team mailing list archive

["Garth N. Wells" <gnw20@xxxxxxxxx>]

On Thu, Dec 6, 2012 at 9:20 AM, Anders Logg <logg@xxxxxxxxx> 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.

Garth

> --
> Anders
>
>
> 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 <logg@xxxxxxxxx> 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 <logg@xxxxxxxxx> 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).
>> >>