Re: dive merge seems broken in latest master

2018-10-15 Thread Dirk Hohndel
> On Oct 15, 2018, at 6:25 AM, Berthold Stoeger > wrote: > > On Monday, 15 October 2018 11:42:26 CEST Jan Mulder wrote: >> On 10/15/18 9:10 AM, Jan Mulder wrote: >>> On 10/15/18 9:06 AM, Berthold Stoeger wrote: On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote: > Tried to

Re: dive merge seems broken in latest master

2018-10-15 Thread Berthold Stoeger
On Monday, 15 October 2018 11:42:26 CEST Jan Mulder wrote: > On 10/15/18 9:10 AM, Jan Mulder wrote: > > On 10/15/18 9:06 AM, Berthold Stoeger wrote: > >> On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote: > >>> Tried to reproduce things. As I do not have 2 DCs, I fake a second one > >>>

Re: dive merge seems broken in latest master

2018-10-15 Thread Jan Mulder
On 10/15/18 9:10 AM, Jan Mulder wrote: On 10/15/18 9:06 AM, Berthold Stoeger wrote: On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote: Tried to reproduce things. As I do not have 2 DCs, I fake a second one just by editing the ssrf XML. I cannot reproduce it (in this way). I can

Re: dive merge seems broken in latest master

2018-10-15 Thread Jan Mulder
On 10/15/18 9:06 AM, Berthold Stoeger wrote: On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote: Tried to reproduce things. As I do not have 2 DCs, I fake a second one just by editing the ssrf XML. I cannot reproduce it (in this way). I can trivially reproduce this by importing a

Re: dive merge seems broken in latest master

2018-10-15 Thread Berthold Stoeger
On Monday, 15 October 2018 08:53:16 CEST Jan Mulder wrote: > Tried to reproduce things. As I do not have 2 DCs, I fake a second one > just by editing the ssrf XML. I cannot reproduce it (in this way). I can trivially reproduce this by importing a divelog onto itself. Therefore, this should be

Re: dive merge seems broken in latest master

2018-10-15 Thread Jan Mulder
On 10/15/18 3:45 AM, Dirk Hohndel wrote: Berthold, This looks like it is yours... Bisect brings us to this: commit 8c2383b4952fa22d41745d29484462ed6a67112b Author: Berthold Stoeger > Date:   Sun Aug 12 22:47:07 2018 -0400 I have too much nitrogen (and too

dive merge seems broken in latest master

2018-10-14 Thread Dirk Hohndel
Berthold, This looks like it is yours... Bisect brings us to this: commit 8c2383b4952fa22d41745d29484462ed6a67112b Author: Berthold Stoeger Date: Sun Aug 12 22:47:07 2018 -0400 I have too much nitrogen (and too little sleep) to figure out HOW and WHY this breaks things, but on a trip with