Re: [Rdkit-devel] [Rdkit-discuss] Some larger-scale RDKit C++ code changes

[Greg L. <gre...@gm...>]

This change has now been made.
The RDKit master branch (the default one in github) has been moved to
modern c++.
The previous status of master is captured here:
https://github.com/rdkit/rdkit/tree/legacy/master

Hopefully this doesn't cause horrible problems for anyone with active
forks, but I figure there are likely to be at least a few bumps. Hopefully
they aren't too large.

-greg


On Thu, Apr 5, 2018 at 8:46 AM, Greg Landrum <gre...@gm...> wrote:

> Thanks for raising this Markus. It had been on my list of things to look
> into for a while and I had been kind of dreading it.[1]
>
> I did a bit of googling and experimentation and it looks like this
> approach works well:
> https://stackoverflow.com/questions/5956300/merging-two-
> very-divergent-branches-using-git
> Given that it also (at least to me) makes sense, I think that this is how
> I'll proceed.
>
> -greg
> [1] this is where I usually point to this xkcd: https://xkcd.com/1597/
> and make a joke about no longer being able to just walk over and ask Nadine
> how to solve the problem. :-)
>
> On Wed, Apr 4, 2018 at 1:20 PM, Markus Sitzmann <mar...@gm...
> > wrote:
>
>> Have you tried a merge (after branching the master to something like
>> master-test-merge and then merge modern_cxx) ? How horrible does it look?
>> It might be quiet okay. Or do you really have a lot of changes in the
>> current master you don't have/want to have in modern_cxx and the future
>> master. And well, it just was a concern by me that avoiding "early" horrors
>> might cause bigger horrors later :-). Renaming the master in a GIT
>> repository is something I wouldn't do easily - I would regard it more like
>> a very, very last resort because if the master is renamed (or replaced by
>> another branch), any branch in any remote repository by anybody who ever
>> branched from master (including the RDKit github repository) becomes
>> potentially (very likely) invalid by this step. Only if this is a small
>> concern, I would do it (I doubt it is in case of RDKit).
>>
>> Markus
>>
>> On Wed, Apr 4, 2018 at 11:56 AM, Greg Landrum <gre...@gm...>
>> wrote:
>>
>>>
>>>
>>> On Wed, Apr 4, 2018 at 11:27 AM, Markus Sitzmann <
>>> mar...@gm...> wrote:
>>>
>>>> Hi Greg,
>>>>
>>>> >  Concretely what this means in github is that the current master
>>>> branch will be renamed to legacy and the modern_cxx branch will be renamed
>>>> to master.
>>>>
>>>> I hope you are not actually just renaming it - although I am not
>>>> affected personally, that might be a call for trouble because it
>>>> invalidates any remote repository of rdkit.
>>>>
>>>
>>> If you have suggestions for how to do a large-delta change like that in
>>> a non-horrible manner, I would love to hear them :-)
>>>
>>> -greg
>>>
>>>
>>
>>
>