>> 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 -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
