I think that between the time that I modified qt_gui.py and the time that I pushed it to my clone of the devel branch, that it got reformatted in origin/ devel. Between my VR3 branch and my devel branch, I see many changes in the file diffs - I'm sure they are what Edward noticed - that are minor reformatting differences, like an extra space before or after a "#" character, or an argument broken over to the next line. This makes me think that someone had run the new automatic reform script over the entire branch.
I completely understand why no one would want to slog through so many of these changes to verify that they are harmless. I'll work out how to recover, and go on from there. On Friday, March 13, 2020 at 1:21:52 AM UTC-4, Matt Wilkie wrote: > > Thomas, I think maybe you have repo directories intermingling and/or not a > clean repo. I just tested this locally and it worked (as in, didn't have a > large diff): > > md code-test > cd code-test > git clone --depth=1 https://github.com/tbpassin/leo-editor.git/ -b VR3 > leo-vr3 > xcopy leo-vr3\leo\plugins\viewrendered3.py ..\leo-editor\leo\plugins\ > xcopy leo-vr3\leo\plugins\viewrendered\* ..\leo-editor\leo\plugins\ > viewrendered\ > xcopy leo-vr3\leo\plugins\qt_gui.py ..\leo-editor\leo\plugins\ > > The git command does a shallow clone using --depth (for speed, only most > recent commit) and grabs only the VR3 branch. > > and then explored the repo with Git Extensions and made the commits. > Here's a screenshot comparing the commit of qt_gui.py with origin/devel > branch: > > -matt > -- 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 leo-editor+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/1f80d744-b5c0-47ad-9d43-d9f2fe1241b7%40googlegroups.com.
