Missing commits

Question

Missing commits

Closed this issue 8 years ago · 4 comments

It looks like some commits are missing from the master branch. Comparing REFPROP_lib.h the HEAD and the logs suggests that fcb2c24, 183a5cd and 5bd15ef have somehow been removed.

Example: The changes from fcb2c24 in line 162 in REFPROP_lib.h are not present in the current master branch...

Answer 1 · 2017-04-06T08:41:54.000Z

My theory is that @ianhbell forgot to include REFPROP_lib.h in 1946ad9

Answer 2 · 2017-04-06T14:58:28.000Z

Hmm…. That seems possible. Those pesky merges. Is this something that you need me to fix, or can you cherry-pick those things back in? From: Jorrit Wronski [mailto:notifications@github.com] Sent: Thursday, April 06, 2017 2:42 AM To: CoolProp/REFPROP-headers <REFPROP-headers@noreply.github.com> Cc: Bell, Ian (Fed) <ian.bell@nist.gov>; Mention <mention@noreply.github.com> Subject: Re: [CoolProp/REFPROP-headers] Missing commits (#7) My theory is that @ianhbell<https://github.com/ianhbell> forgot to include REFPROP_lib.h in 1946ad9<1946ad9> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#7 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/ALaZLb3idyPauZkrT8feXIvPyNSkQBKmks5rtKVSgaJpZM4M1Pna>.

Answer 3 · 2017-04-06T20:33:46.000Z

No, I think I fixed it. Could you please review #8, which should contain all the code again?

Answer 4 · 2017-04-07T14:41:16.000Z

Looks good to me I think.

…

On Thu, Apr 6, 2017 at 2:33 PM, Jorrit Wronski ***@***.***> wrote: No, I think I fixed it. Could you please review #8 <#8>, which should contain all the code again? — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#7 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABxha1firbgbsY64QRzt3ls-JOKnzKR6ks5rtUwrgaJpZM4M1Pna> .