I think part of the trouble came when I included leoConfig.py in my
own LeoPy.leo as an @thin file, and that changed leoConfig.py enough
to create a conflict with the official inclusion of leoConfig.py into
LeoPyRef.leo. I never intentionally change LeoPyRef.leo (other than
to remove conflicts), but when the situation was confused I opened it
so as to compare it to my own LeoPy.leo; I could easily have saved it
by mistake. I'm not going to avoid doing that in the future. Should
I be copying LeoPyRef.leo to LeoPy.leo after every merge?
- Stephen
On Apr 3, 7:32 pm, "Edward K. Ream" <[EMAIL PROTECTED]> wrote:
> On Thu, Apr 3, 2008 at 5:40 PM, Terry Brown <[EMAIL PROTECTED]> wrote:
>
> > On Thu, 3 Apr 2008 15:31:17 -0700 (PDT)
> > thyrsus <[EMAIL PROTECTED]> wrote:
>
> > > The only trouble I've had is in the LeoPyRef.leo file.
>
> > I use a local non-vcs copy of LeoPyRef.leo and LeoPluginsRef.leo, just
> > using them as a way to edit the @thin files anyway.
>
> > bzr status
>
> > unknown:
> > leo/plugins/leoPluginsRefTB.leo
> > leo/src/LeoPyRefTB.leo
>
> > Of course certain things would require actual edits of those files.
>
> The recommended way is to copy LeoPyRef.leo to leoPy.leo. It's already in
> .bzrignore.
>
> Edward
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
