Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 5:08:58 PM UTC-5, Edward K. Ream wrote: Rev 3a9e54e reverts *almost* everything to 5c25d3f, the last commit before > everything went weird. The only real omission was the recent changes to > quicksearch.py. > Apparently, I was mistaken. quicksearch.py is as Vitalije

Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 3:44:10 PM UTC-5, Terry Brown wrote: This is interesting: > > https://api.github.com/repos/leo-editor/leo-editor/events What does this mean? Does it give info not provided by gitk? > I think it confirms my impression that f0a76ae collapsed the branches > together

Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 6:08:26 PM UTC-5, Terry Brown wrote: > I wonder if some variation​ ​of the above was what caused the problem > > in the first place - the possibility I only just thought of being "No > > to all" when "Yes to all" was more appropriate. Wondering if that > > could caus

Re: Please make no changes to *any* branch for now

On Mon, 3 Jul 2017 17:38:49 -0500 "Edward K. Ream" wrote: >   > I wonder if some variation​ ​of the above was what caused the problem > in the first place - the possibility I only just thought of being "No > to all" when "Yes to all" was more appropriate.  Wondering if that > could cause both bra

Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 3:11:47 PM UTC-5, Edward K. Ream wrote: Until I figure out what is happening I recommend suspending *all* work on > Leo, even in branches. > With Terry's help, it appears that the master and sqlite-format branches are again safe to use. Edward -- You received this

Re: Please make no changes to *any* branch for now

On Mon, Jul 3, 2017 at 5:22 PM, Terry Brown wrote: > > I think it could have been done with git. ​Of course it could have.​ > I wonder if some variation > ​ ​ > of the above was what caused the problem in the first place - the > possibility I only just thought of being "No to all" when "Yes

Re: Please make no changes to *any* branch for now

On Mon, 3 Jul 2017 15:08:57 -0700 (PDT) "Edward K. Ream" wrote: > On Monday, July 3, 2017 at 3:44:10 PM UTC-5, Terry Brown wrote: > > > > > Anyway, as long as no one uses git push --force, I don't think it's > > possible to lose anything. > > > > Right. We can't do that. > > This page >

Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 3:44:10 PM UTC-5, Terry Brown wrote: > > Anyway, as long as no one uses git push --force, I don't think it's > possible to lose anything. > Right. We can't do that. This page

Re: Please make no changes to *any* branch for now

On Mon, 3 Jul 2017 13:35:12 -0700 (PDT) "Edward K. Ream" wrote: > On Monday, July 3, 2017 at 3:11:47 PM UTC-5, Edward K. Ream wrote: > > > > I am attempting to understand why code keeps changing unexpectedly. > > > > I am pretty sure that rev 5c25d3f works as expected. > > Somehow something pr

Re: Please make no changes to *any* branch for now

On Mon, 3 Jul 2017 13:11:47 -0700 (PDT) "Edward K. Ream" wrote: > I am attempting to understand why code keeps changing unexpectedly. > > Clearing .leo/db does not completely solve all problems. It may be > that #505 should be reopened, but something stranger may be > happening. Perhaps pre-50

Re: Please make no changes to *any* branch for now

On Monday, July 3, 2017 at 3:11:47 PM UTC-5, Edward K. Ream wrote: > > I am attempting to understand why code keeps changing unexpectedly. > I am pretty sure that rev 5c25d3f works as expected. Somehow something pretty strange happened after that. I think the best thing to do is to pretend that

Please make no changes to *any* branch for now

I am attempting to understand why code keeps changing unexpectedly. Clearing .leo/db does not completely solve all problems. It may be that #505 should be reopened, but something stranger may be happening. Perhaps pre-505 code remains in branches. Perhaps something else. Until I figure out w