I'm missing some essential piece of understanding, I think. 1. I work on an existing external file (this is mostly what I have done). This probably won't change LeoPyRef. I commit the changed external file but don't commit LeoPyRef. I don't see this as needing a leoPy.leo outline at all.
2. I want to add a new directory, probably with some new external files in it. I make the changes to LeoPyRef and to my local worktree. I commit the new directory and files, and also LeoPyRef. What problems would this create that would be avoided by going through leoPy? 3. I want to add a new file to the existing directory tree; perhaps it's a new plugin, perhaps it's a new language mode file. I commit the new file, and I add a new subtree for it to LeoPyRef and commit that. How will that create possible merge problems that would be avoided by making a new LeoPyRef outline from an intermediate leoPy outline? I can see that there could be difficulties when one is working in one branch and makes changes to LeoPyRef as well as changes to external files; and then before the PR for that is merged, some other PR rom another branch with other changes to LeoPyRef gets merged. What I don't see is how making changes in a leoPy outline and writing a new LeoPyRef outline from it will help with this situation. Either way, you end up with a PR that has changes to LeoPyRef that need to be reconciled with some other PR's changes. On Tuesday, September 20, 2022 at 12:32:47 PM UTC-4 Edward K. Ream wrote: > On Tue, Sep 20, 2022 at 11:29 AM Thomas Passin <[email protected]> wrote: > > Looking through the write-leoPyRef, I infer that we are expected to create >> a leoPy.leo outline - presumably by saving LeoPyRef by that name, doing all >> our work in leoPy, then using the write-leoPyRef command. Is that the idea? > > > Yes. > > Why isn't it OK to just work with LeoPyRef, and avoid all the headaches of >> diffs because of changed gnxs, etc? >> > > gnx's aren't a big problem. > > What we want is to avoid git merge problems with LeoPyRef.leo. Local > copies (leoPy.leo) should avoid most git conflicts. > > Edward > -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/08ca2ed2-82b5-4171-aa18-840e09883469n%40googlegroups.com.
