Smalltalk › Squeak › Squeak VM

[OpenSmalltalk/opensmalltalk-vm] c6ec24: Merge branch 'Cog' of http://github.com/OpenSmallt...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

4 messages Options

Eliot Miranda-3

[OpenSmalltalk/opensmalltalk-vm] c6ec24: Merge branch 'Cog' of http://github.com/OpenSmallt...

Branch: refs/heads/fniephaus/smalltalk-ci/no-exit
Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
Commit: c6ec24cec26e148a59682e99c3a57b3837c2bbeb
https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c6ec24cec26e148a59682e99c3a57b3837c2bbeb
Author: Eliot Miranda <[hidden email]>
Date: 2017-07-10 (Mon, 10 Jul 2017)

Changed paths:
M .bintray.json
M .travis_deploy.sh
M image/buildsistareaderimage.sh
M image/buildspurtrunk64image.sh
M image/buildspurtrunkreader64image.sh
M image/buildspurtrunkreaderimage.sh
M image/buildspurtrunkvmmakerimage.sh
M image/getGoodCogVM.sh
M image/getGoodSpurNsvm.sh
M image/getGoodSpurVM.sh
M image/resizesqueakwindow.sh
M image/updatespurimage.sh
M image/updatevmmakerimage.sh
M image/uploadspurimage.sh
M platforms/Cross/vm/sqSCCSVersion.h
M platforms/unix/vm/sqUnixHeartbeat.c

Log Message:
-----------
Merge branch 'Cog' of http://github.com/OpenSmalltalk/opensmalltalk-vm into Cog

[no exit version]

Eliot Miranda-2

Re: [OpenSmalltalk/opensmalltalk-vm] c6ec24: Merge branch 'Cog' of http://github.com/OpenSmallt...

Hi,

> On Jul 10, 2017, at 12:38 AM, GitHub <[hidden email]> wrote:
>
> Branch: refs/heads/fniephaus/smalltalk-ci/no-exit
> Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
> Commit: c6ec24cec26e148a59682e99c3a57b3837c2bbeb
> https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c6ec24cec26e148a59682e99c3a57b3837c2bbeb
> Author: Eliot Miranda <[hidden email]>
> Date: 2017-07-10 (Mon, 10 Jul 2017)
>
> Changed paths:
> M .bintray.json
> M .travis_deploy.sh
> M image/buildsistareaderimage.sh
> M image/buildspurtrunk64image.sh
> M image/buildspurtrunkreader64image.sh
> M image/buildspurtrunkreaderimage.sh
> M image/buildspurtrunkvmmakerimage.sh
> M image/getGoodCogVM.sh
> M image/getGoodSpurNsvm.sh
> M image/getGoodSpurVM.sh
> M image/resizesqueakwindow.sh
> M image/updatespurimage.sh
> M image/updatevmmakerimage.sh
> M image/uploadspurimage.sh
> M platforms/Cross/vm/sqSCCSVersion.h
> M platforms/unix/vm/sqUnixHeartbeat.c
>
> Log Message:
> -----------
> Merge branch 'Cog' of http://github.com/OpenSmalltalk/opensmalltalk-vm into Cog
>
> [no exit version]

What is going on here? Several messages and merging Cog into Cog?

fniephaus

Re: [OpenSmalltalk/opensmalltalk-vm] c6ec24: Merge branch 'Cog' of http://github.com/OpenSmallt...

Hi Eliot,

On Mon, Jul 10, 2017 at 8:47 AM Eliot Miranda <[hidden email]> wrote:

Hi,

> On Jul 10, 2017, at 12:38 AM, GitHub <[hidden email]> wrote:
>
> Branch: refs/heads/fniephaus/smalltalk-ci/no-exit
> Home: https://github.com/OpenSmalltalk/opensmalltalk-vm
> Commit: c6ec24cec26e148a59682e99c3a57b3837c2bbeb
> https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c6ec24cec26e148a59682e99c3a57b3837c2bbeb
> Author: Eliot Miranda <[hidden email]>
> Date: 2017-07-10 (Mon, 10 Jul 2017)
>
> Changed paths:
> M .bintray.json
> M .travis_deploy.sh
> M image/buildsistareaderimage.sh
> M image/buildspurtrunk64image.sh
> M image/buildspurtrunkreader64image.sh
> M image/buildspurtrunkreaderimage.sh
> M image/buildspurtrunkvmmakerimage.sh
> M image/getGoodCogVM.sh
> M image/getGoodSpurNsvm.sh
> M image/getGoodSpurVM.sh
> M image/resizesqueakwindow.sh
> M image/updatespurimage.sh
> M image/updatevmmakerimage.sh
> M image/uploadspurimage.sh
> M platforms/Cross/vm/sqSCCSVersion.h
> M platforms/unix/vm/sqUnixHeartbeat.c
>
> Log Message:
> -----------
> Merge branch 'Cog' of http://github.com/OpenSmalltalk/opensmalltalk-vm into Cog
>
> [no exit version]

What is going on here? Several messages and merging Cog into Cog?

Sorry, I was rebuilding 201608171728 ht vms without the exit statement, so we can use them for CI testing on Travis' infrastructure.

To avoid changing the version number, I modified the original commit and pushed everything onto a new branch.

Fabio

Jakob Reschke-2

Re: [OpenSmalltalk/opensmalltalk-vm] c6ec24: Merge branch 'Cog' of http://github.com/OpenSmallt...

In reply to this post by Eliot Miranda-2

...which explains the strange message of merging into Cog on a branch
that is not really the Cog branch.

Apart from that, the reason for "merging Cog into Cog" is that the
quoted branch name is the remote branch name, while the branch name at
the end of the sentence is the local branch name. Such merge messages
are generated by git pull.

It looks more useful when pulling from a remote branch that has a
different name, either because it actually is a different branch of
development or because the branch simply has a different name at the
remote.

2017-07-10 19:15 GMT+02:00 Fabio Niephaus <[hidden email]>:
>