[Vm-dev] Recipe for mergine fix_include_order

David T. Lewis lewis at mail.msen.com
Sat Jun 26 20:37:40 UTC 2021

Here is my current recipe for merging the fix_include_order and
dtl/epoll-forksqueak branches into the main Cog branch to produce
a functioning VM on Linux (and hopefully Cygwin):

$ cd <somewhere>/opensmalltalk-vm #my working git folder
$ git reset --hard origin/Cog
Now in an up to date VMMaker image:
	merge VMMaker.oscog-nice.2957 from inbox into into VMMaker.oscog-eem.2973
	generated all sources
$ tar czvf ../src.tgz *src* #save all previously generated sources
$ git reset --hard Cog
$ git merge fix_include_order
$ tar xzvf ../src.tgz # reapply the sources that should not be included in merge
$ git reset `git status | grep 'both modified' | sed s/'.*modified:'//` #discard changes as resolved
$ git commit
$ git merge dtl/epoll-forksqueak
$ tar xzvf ../src.tgz
$ git commit . -m 'restore sources'
$ git push #if all of the above worked as expected


More information about the Vm-dev mailing list