Merge opencog to singnet

singnet / opencog

A framework for integrated Artificial Intelligence & Artificial General Intelligence (AGI)

http://wiki.opencog.org/w/Development

Other

14 stars 3 forks source link

Merge opencog to singnet #54

Closed vsbogd closed 5 years ago

vsbogd commented 5 years ago

This PR is part of a bunch:

opencog/cogutil -> singnet/cogutil (no conflicts) PR https://github.com/singnet/cogutil/pull/19
opencog/atomspace -> singnet/atomspace (no conflicts) https://github.com/singnet/atomspace/pull/53
opencog/opencog -> singnet/opencog (conflicts resolved) https://github.com/singnet/opencog/pull/54

vsbogd commented 5 years ago

@ngeiswei , could you please take a look. I see too many commits here but I am not sure about the reason.

amebel commented 5 years ago

@vsbogd Unlike atomspace and cogutil, singnet/opencog history has diverged from opencog/opencog. If you take the oldest commit in this pr and grep for it you get the following

on opencog/opencog

>> git log --grep="Move parameters to icl-parameters.scm" opencog/master
commit 3ac0bcd2a51f8827147242574c4aafb327c3a1d0
Author: Nil Geisweiller <ngeiswei@gmail.com>
Date:   Mon Aug 13 11:05:43 2018 +0300

    Move parameters to icl-parameters.scm

on singnet/opencog

>> git log --grep="Move parameters to icl-parameters.scm" singnet/master
commit ac396656f114459dc028cd6cd710d595ea2c5b50
Author: Nil Geisweiller <ngeiswei@gmail.com>
Date:   Mon Aug 13 11:05:43 2018 +0300

    Move parameters to icl-parameters.scm

commit 84577d8d90cf7728b141aa8d29580f70cc3ea689
Author: Nil Geisweiller <ngeiswei@gmail.com>
Date:   Mon Aug 13 11:05:43 2018 +0300

    Move parameters to icl-parameters.scm

vsbogd commented 5 years ago

@AmeBel, thanks for looking into this. I also discussed it with @ngeiswei and I see you have raised https://github.com/opencog/opencog/pull/3394 . Unfortunately I will not have time at nearest week to look at it closer, so I am closing it for now.

ngeiswei commented 5 years ago

Thanks to https://github.com/opencog/opencog/pull/3394, opencog/opencog and singnet/opencog are now almost in sync, however merging opencog/opencog into singnet/opencog produces lot of redundant commits. I'm not sure what's the best course of actions, either force-pushing opencog on singnet, or maybe do a crazy tedious rebase of singnet onto opencog, etc.

amebel commented 5 years ago

I think it is best to create a branch of the present master just in case not all of the commits are not ported to opencog/opencog, and then replace it with opencog/opencog master.

ngeiswei commented 5 years ago

That's wise.