Anyone else having problems with Launchpad?
Glad there was a simple fix. I think the safe way is to use lp:leo-editor.
EKR
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.
I wonder, is it possible to delete the old branch entirely, or would
that cause problems?
Edward
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
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