Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-05 Thread Edward K. Ream
On Wed, Jul 5, 2017 at 3:27 AM, vitalije wrote: > I am back and glad to see that this issue has been resolved. However, when > I tried to continue work on my sqlite-format branch I couldn't make it in > sync with current master without loosing all my work on sqlite-format. >

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Xavier G. Domingo
El 04/07/2017 a las 11:52, Terry Brown escribió: I think we're ok there, the reverts that Vitalije did may have left an incomplete set of sqlite-format work master, but Edwards fix probably cleaned those out (although git revert f0a76ae might have been more thorough). And the sqlite-format

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Edward K. Ream
On Tue, Jul 4, 2017 at 10:24 AM, Xavier G. Domingo wrote: ​> ​ The output of the git fsck seems correct. Dangling commits are not a problem. Thanks. Several dangling commits and blobs persist even after git gc --aggressive. Happily, the notes section

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Xavier G. Domingo
El 04/07/2017 a las 11:55, Terry Brown escribió: On Tue, 4 Jul 2017 09:29:01 -0500 "Edward K. Ream" wrote: On Tue, Jul 4, 2017 at 7:46 AM, Xavier G. Domingo wrote: I think from past experience that some git corruption could lead to this kind of

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Terry Brown
On Tue, 4 Jul 2017 09:29:01 -0500 "Edward K. Ream" wrote: > On Tue, Jul 4, 2017 at 7:46 AM, Xavier G. Domingo > wrote: > > I think from past experience that some git corruption could lead to > this > > kind of "surprises". In those cases, the "git

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Terry Brown
On Tue, 4 Jul 2017 09:46:15 -0300 "Xavier G. Domingo" wrote: > What I'm not so clear is about the current result of the various > reverts... I think we're ok there, the reverts that Vitalije did may have left an incomplete set of sqlite-format work master, but Edwards fix

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Edward K. Ream
On Tue, Jul 4, 2017 at 7:46 AM, Xavier G. Domingo wrote: I think from past experience that some git corruption could lead to this > kind of "surprises". In those cases, the "git fsck" command was essential > to see the causes... > ​Many thanks for this tip. Here are the

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-04 Thread Xavier G. Domingo
El 03/07/2017 a las 16:36, Terry Brown escribió: It seems to me that the commit that collapsed the two branches together was f0a76ae7b793e8adc2964402e86b27c4ecfef19d Author: Edward K. Ream 2017-07-03 08:56:38 Committer: Edward K. Ream 2017-07-03

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread Edward K. Ream
On Mon, Jul 3, 2017 at 2:36 PM, Terry Brown wrote: > > This is driving me nuts, I still can't work out exactly what happened > here. It seems to me that the commit that collapsed the two branches > together was > > f0a76ae7b793e8adc2964402e86b27c4ecfef19d > Author: Edward

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread Terry Brown
On Mon, 3 Jul 2017 12:40:25 -0500 Terry Brown <terrynbr...@gmail.com> wrote: > On Mon, 3 Jul 2017 08:12:39 -0700 (PDT) > "Edward K. Ream" <edream...@gmail.com> wrote: > > > Oops: 58d7b463504 merges sqlite-format branch into master > > I'v

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread vitalije
I have tried two reverts and it did something. In diffs of last revert I can see my changes being marked red as deleted. I don't know if it reverted complete. I am sorry to tell but, I want be available for the next two days. I hope I didn't broke something. Vitalije -- You received this

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread Terry Brown
On Mon, 3 Jul 2017 11:25:28 -0500 Edward K Ream wrote: > Google git revert :) > Sent from my iPhone Looking at gitk --all I'm not sure if this was Vitalije or you, Edward. f0a76ae looks more suspicious than any of Vitalije's commits, although I'm really not sure, gitk is a

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread Terry Brown
On Mon, 3 Jul 2017 08:37:34 -0700 (PDT) vitalije wrote: > I thought that I was merging master into sqlite-format not the other > way. I am not sure how to undo it. To checkout previous commit and > then to do what? > > On Monday, July 3, 2017 at 5:12:39 PM UTC+2, Edward K.

Re: Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread vitalije
I thought that I was merging master into sqlite-format not the other way. I am not sure how to undo it. To checkout previous commit and then to do what? On Monday, July 3, 2017 at 5:12:39 PM UTC+2, Edward K. Ream wrote: > > I don't think I did this, although I can't be sure. > > Vitalije, could

Oops: 58d7b463504 merges sqlite-format branch into master

2017-07-03 Thread Edward K. Ream
I don't think I did this, although I can't be sure. Vitalije, could you please undo this? The sqlite-format should remain separate for awhile longer. Thanks. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this