IMPORTANT: Leo launchpad bzr reconfigured (and fixed)
Terry Brown
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3
which can be branched on a 1 Gb XP system over HTTP.
It would be great if anyone who was experiencing the out of memory
problem could confirm it works for them now.
Branches that were pointing at lp:leo-editor or
bazaar.launchpad.net/+branch/leo-editor/ should be unaffected, branches pointing at anything else might need a `bzr pull --remember lp:leo-editor`. Revision IDs have not changed, so nothing should be lost branch compatibility wise.
The rest of this email is my log while I was beating it into submission, no need to read further.
https://code.launchpad.net/leo-editor
indicates that
lp:leo-editor and https://launchpad.net/leo-editor/trunk2 are aliases for
https://code.launchpad.net/~edreamleo/leo-editor/trunk2
while lp:leo-editor/trunk and lp:leo-editor/trunk are aliases for
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk
I think only edreamleo can write to */trunk2, and also both of them
contain the glitch which prevents bzr from working over plain http(s)
on small memory windows machines.
So, after archiving the original trunk I tried putting a fresh pull of
trunk2 into trunk using bzr --overwrite. It only took 30 seconds, so I
don't think it did what I wanted. 1GB XP checkout still fails. So,
I did `bzr init empty` created and added and committed a single empty
file there, and pushed empty to trunk, then pushed trunk2 again. Again
it only took a few seconds, so it's obviously not really overwriting
anything.
So I do
time bzr push --overwrite bzr+ssh://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3
and get
Using default stacking branch /+branch-id/556206 at lp-64806800:///~leo-editor-team/leo-editor
Created new stacked branch referring to /+branch-id/556206.
real 0m13.407s
user 0m0.152s
sys 0m0.028s
I think this whether you want it or not stacking is the problem, so I
do:
bzr reconfigure --unstacked bzr+ssh://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3
This took a long time, I have 7Mbs down but only 0.875 up, it
definitely uploaded a complete copy, I suspect it also downloaded it.
Ok, that seems to have worked. End of log :-)
Cheers -Terry
HansBKK
lp:leo-editor now points to
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3which can be branched on a 1 Gb XP system over HTTP.
It would be great if anyone who was experiencing the out of memory
problem could confirm it works for them now.
> bzr branch lp:leo-editor
bzr: ERROR: http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/.bzr/repository/packs/f8ee8720b9c1d194b1f6a4cfaeb1153a.pack is redirected to https://
launchpad.net
HansBKK
>bzr export .\leo-editor4 lp:leo-editor
which seemed to complete just fine, no error messages anyway and:
28310kB 140kB/s \
However, when actually running this instance, it also (along with the nightly zip download) reports:
build 4904 2011-12-28
This is from selecting Help > About - is it possible this somehow is reporting the wrong version?
If so, should I log it to the tracker? And is there a more accurate way to determine Leo's actual version?
HansBKK
Terry Brown
HansBKK <han...@gmail.com> wrote:
> However, when actually running this instance, it also (along with the
> nightly zip download) reports:
>
> build 4904 2011-12-28
>
> This is from selecting Help > About - is it possible this somehow is
> reporting the wrong version?
>
> If so, should I log it to the tracker? And is there a more accurate way to
> determine Leo's actual version?
Currently Leo reporting its revno correctly requires a batchfile to be
run on each commit, I think it would make more sense for Leo to check
for Leo to grab the info from .../leo/.bzr/branch/last-revision if that
exists, so that if you're running from bzr you get the right number,
and if not, well then it's probably a build where the
leo/core/bzr_version.py is correct. So I think it needs fixing in two places, Leo itself so versions checked out from bzr use .../leo/.bzr/branch/last-revision, and on the nightly snapshot so leo/core/bzr_version.py is always correct there.
You can post all this to a bug, I'll make a note to fix the snapshot
thing.
Cheers -Terry
Terry Brown
Terry Brown <terry_...@yahoo.com> wrote:
> So I think it needs fixing in two places, Leo itself so versions checked out from bzr use .../leo/.bzr/branch/last-revision, and on the nightly snapshot so leo/core/bzr_version.py is always correct there.
>
> You can post all this to a bug, I'll make a note to fix the snapshot
> thing.
Fixed on the .zip snapshots, bzr downloads will still only be as
correct as the last time Edward ran v.bat, unless Leo learns to
read .../leo/.bzr/branch/last-revision
Cheers -Terry
HansBKK
HansBKK
> Branched 4907 revision(s).
HansBKK
Edward K. Ream
> lp:leo-editor now points to
> https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3
First of all, many thanks for this work.
To make this work I had to do bzr pull lp:leo-editor. Previously, on
my machine, the remembered branch was a more explicit path. I suppose
this was a mistake on my part.
I'm worried about trunk3 being part of the leo-editor-team project
rather than the leo-editor project. Would it be possible make trunk3
part of the leo-editor project?
Edward
Terry Brown
Hmm, if you log in to LP, go to Code and view
Branches with status: Merged you can see the old one at lp:leo-editor/old-trunk pointing to https://code.launchpad.net/~leo-editor-team/leo-editor/trunk so it seems it was alwats under leo-editor-team, but I should have put it at
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3 to be more consistent / allow scope for the leo-editor-team to branch out to new projects :-)
Hmm again,
bzr push bzr+ssh://code.launchpad.net/~leo-editor-team/leo-editor/trunk3
just sits there staring at me generating no network traffic.
Maybe I'll try again later.
I think the bottom line is that everyone should use lp:leo-editor if
it's the trunk they're after, and we can move it into
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3
without any impact.
Cheers -Terry
Terry Brown
Terry Brown <terry_...@yahoo.com> wrote:
> Hmm, if you log in to LP, go to Code and view
> Branches with status: Merged you can see the old one at lp:leo-editor/old-trunk pointing to https://code.launchpad.net/~leo-editor-team/leo-editor/trunk so it seems it was alwats under leo-editor-team, but I should have put it at
> https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3 to be more consistent / allow scope for the leo-editor-team to branch out to new projects :-)
Wait, apparently I can't read what's in front of me - it is at
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3, so it is consistent placement wise with the old one, vs. your intermediate version at
https://code.launchpad.net/~edreamleo/leo-editor/trunk2, which I think wouldn't work unless you give us all your ssh key :-)
So I don't think it's any more part of the leo-editor-team project
rather than the leo-editor project than it's ever been.
Cheers -Terry
mdb
> problem could confirm it works for them now.
today. Got rev 4911 in the bzr message
And like the ssh based bzr pull I set up on my work PC (to get arounf
the memory problem), startup shows
build 4904, 2011-12-28 13:18:50 -0500, but I assume this is just due
to out of date version text