I'm in bzr pain

32 views
Skip to first unread message

tfer

unread,
Mar 2, 2012, 12:43:07 AM3/2/12
to leo-editor
Since I'm getting a behavior no one else is seeing, I thought I'd
download the Leo trunk branch from scratch and try a fresh copy of the
latest version.

It appears Leo has so many files and revisions that this can't be done
anymore, you get an out of memory error. Checking via google it
appears all the files and revisions are downloaded and applied in
memory. Unless you do a lot of playing around, this all has to be
done in the amount of memory python can provide bzr, which is not all
your memory.

The suggested workaround was to add only a few revisions at a time.

-r2500 worked, then pulled to -r3000, but after that I seem to have to
go up by twenties.

This is going to take a while.

tfer

unread,
Mar 2, 2012, 1:05:53 AM3/2/12
to leo-editor
So I tried a checkout instead of branch, seemed to work but got:
Working tree is up to date at revision 4935.

That is not the latest rev, something is going on.

Anyone else having problems with Launchpad?

Tom

zpcspm

unread,
Mar 2, 2012, 11:05:37 AM3/2/12
to leo-e...@googlegroups.com


On Friday, March 2, 2012 8:05:53 AM UTC+2, tfer wrote:

Anyone else having problems with Launchpad?


IIRC there was a thread about this some time ago, but it was related only to memory problems when running bzr in Windows. Just did a test branch from launchpad:

$ time bzr branch lp:leo-editor
Branched 5054 revision(s).                                                                                     

real    2m20.692s
user    0m42.054s
sys    0m1.153s
 
Here's some details about my setup to match against:

slackware linux 13.37 (64bit)
bzr 2.3.0 (vanilla, built from source)
python 2.6.6
python process that ran bzr took max 130 MB of RAM while working
peak download speed from launchpad was 1Mbps

tfer

unread,
Mar 3, 2012, 12:01:27 AM3/3/12
to leo-editor
Dang, I'd bound leo to trunk, I see that the head is now trunk3, no
wonder I wasn't able to pull latest.

Edward K. Ream

unread,
Mar 3, 2012, 5:49:25 AM3/3/12
to leo-e...@googlegroups.com
On Fri, Mar 2, 2012 at 11:01 PM, tfer <tfeth...@aol.com> wrote:
> Dang, I'd bound leo to trunk, I see that the head is now trunk3, no
> wonder I wasn't able to pull latest.

Glad there was a simple fix. I think the safe way is to use lp:leo-editor.

EKR

zpcspm

unread,
Mar 3, 2012, 10:30:29 AM3/3/12
to leo-e...@googlegroups.com


On Saturday, March 3, 2012 12:49:25 PM UTC+2, Edward K. Ream wrote:
On Fri, Mar 2, 2012 at 11:01 PM, tfer wrote:
> Dang, I'd bound leo to trunk, I see that the head is now trunk3, no
> wonder I wasn't able to pull latest.

Glad there was a simple fix.  I think the safe way is to use lp:leo-editor.


This of course works for branching, but for updating a local copy `bzr pull` is just enough, initial branching location seems to be stored and is used by default. Maybe there's a way to lock somehow that outdated branch on launchpad so that bzr client would throw some explicit error when people who missed that change on launchpad will still try to pull from it?

Edward K. Ream

unread,
Mar 3, 2012, 10:38:23 AM3/3/12
to leo-e...@googlegroups.com
On Sat, Mar 3, 2012 at 9:30 AM, zpcspm <zpc...@gmail.com> wrote:
> Maybe there's a way to lock somehow that outdated branch on launchpad so that bzr client would throw some explicit error when people who missed that change on launchpad will still try to pull from it?

I wonder, is it possible to delete the old branch entirely, or would
that cause problems?

Edward

Matt Wilkie

unread,
Mar 12, 2012, 8:36:57 PM3/12/12
to leo-e...@googlegroups.com
>> Glad there was a simple fix.  I think the safe way is to use
>> lp:leo-editor.
>
>
> This of course works for branching, but for updating a local copy `bzr
> pull` is just enough, initial branching location seems to be stored and is
> used by default.

Hi All, (this is a success story, eventually, I'm just reporting the
details in case it helps someone else)

I've been away from Leo for a few weeks and was quite surprised when I
ran `bzr pull` (via Bazaar Explorer on Windows) and it reported no
changes to pull. Seeing the great amount of traffic here on the list I
knew that couldn't be true, so I headed to the launchpad page to see
what was up.

The LP page (https://launchpad.net/leo-editor) says trunk2 is the
development focus, so I changed the Location url to match,
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk2/, and
received " ERROR: Not a branch".

Hovering over the "lp:leo-editor" link on the launchpad page says the
actual trunk is
https://code.launchpad.net/~leo-editor-team/leo-editor/trunk3, so I
tried that. It worked a little better, but still not complete:

{{{
Run command: bzr pull
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3 is
permanently redirected to
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/changes
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
}}}

After that "bzr merge
http://bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/"
worked aside from a conflicted LeoProjects.txt. I reverted the file as
I've never been able to get the Bazaar Explorer conflict tool to do
anything useful and there are no changes in there I want to keep
anyway.

Then bazaar explorer wanted me to commit changes. That wouldn't be
appropriate as I don't having anything I'm trying to push to the
trunk. I ignored that message and just ran pull again and now I'm
sitting at rev 5133 and Leo appears happy.

now I'm off to have a look at bigdash!

--
-matt

Matt Wilkie

unread,
Mar 14, 2012, 2:24:50 PM3/14/12
to leo-e...@googlegroups.com
> The LP page  (https://launchpad.net/leo-editor) says trunk2 is the
> development focus,

Being a member of the dev team I just realised I could fix this
myself. I rather I could if I understood the launchpad structure and
relationships of branches, series and milestones. I don't, so I left
it alone. ;-)

From https://launchpad.net/leo-editor/+edit trunk3 is not on the list
of available choices for the "Development focus: " field. There is
only "leo-editor 4.10, leo-editor 4.9, leo-editor old-trunk,
leo-editor trunk2". Some of those are milestones, some aren't, other
milestones are missing. Some are series, others aren't. One is a
branch, other branches are missing.

I guess I've just rediscovered for myself why someone else hasn't
already set the correct dev-focus property!

cheers,

--
-matt

Reply all
Reply to author
Forward
0 new messages