Smalltalk › Squeak › Squeak - Dev

Unmerged trunk versions

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 6 messages Options
Jakob Reschke
Reply | Threaded
Open this post in threaded view
♦
♦
|

Unmerged trunk versions

Jakob Reschke
Hi,

I just noticed that Tools-ct.915 is in Trunk, but not part of the ancestry of the latest version:

image.png

Might want to double-check such things before the release.

Kind regards,
Jakob
Christoph Thiede
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: Unmerged trunk versions

Christoph Thiede

Possibly a similar issue?




Best,

Christoph

Von: Squeak-dev <[hidden email]> im Auftrag von Jakob Reschke <[hidden email]>
Gesendet: Montag, 30. Dezember 2019 15:16:16
An: [hidden email]
Betreff: [squeak-dev] Unmerged trunk versions
 
Hi,

I just noticed that Tools-ct.915 is in Trunk, but not part of the ancestry of the latest version:

image.png

Might want to double-check such things before the release.

Kind regards,
Jakob


Carpe Squeak!
Chris Muller-3
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: Unmerged trunk versions

Chris Muller-3
Hi Christoph,

Installer-cmm.436 replaces 435, which was a mistake I preferred to discard than permanently archive.  It's been treated it, if you simply Load 436 (instead of merge), it doesn't include 435 in its ancestry.

Not sure about Tools-ct.915, should it be merged or treated?


On Mon, Dec 30, 2019 at 7:15 PM Thiede, Christoph <[hidden email]> wrote:

Possibly a similar issue?




Best,

Christoph

Von: Squeak-dev <[hidden email]> im Auftrag von Jakob Reschke <[hidden email]>
Gesendet: Montag, 30. Dezember 2019 15:16:16
An: [hidden email]
Betreff: [squeak-dev] Unmerged trunk versions
 
Hi,

I just noticed that Tools-ct.915 is in Trunk, but not part of the ancestry of the latest version:

image.png

Might want to double-check such things before the release.

Kind regards,
Jakob
Jakob Reschke
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: Unmerged trunk versions

Jakob Reschke
Hi Chris,

To not mislead the tools I suggest to move the ex-Trunk version Installer-cmm.435 to the treated inbox.

Does 436 note the skipped number 435 in its message? Otherwise some future historian might wonder whether or why something is missing from the repositories.

Happy new year!
Kind regards,
Jakob

Am Mi., 1. Jan. 2020 um 00:26 Uhr schrieb Chris Muller <[hidden email]>:
Hi Christoph,

Installer-cmm.436 replaces 435, which was a mistake I preferred to discard than permanently archive.  It's been treated it, if you simply Load 436 (instead of merge), it doesn't include 435 in its ancestry
Christoph Thiede
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: Unmerged trunk versions

Christoph Thiede

Hi all, Hi Chris,


I see, it is a bit confusing to read these unmerged versions in a Trunk repo. Don't we have any guidelines for this? Usual git approach would be to push a revert commit ...


> Not sure about Tools-ct.915, should it be merged or treated?


At least I never requested to treat it :)

^ Year new beHappy :-)

Best,
Christoph
Von: Squeak-dev <[hidden email]> im Auftrag von Jakob Reschke <[hidden email]>
Gesendet: Mittwoch, 1. Januar 2020 18:11:02
An: Chris Muller; The general-purpose Squeak developers list
Betreff: Re: [squeak-dev] Unmerged trunk versions
 
Hi Chris,

To not mislead the tools I suggest to move the ex-Trunk version Installer-cmm.435 to the treated inbox.

Does 436 note the skipped number 435 in its message? Otherwise some future historian might wonder whether or why something is missing from the repositories.

Happy new year!
Kind regards,
Jakob

Am Mi., 1. Jan. 2020 um 00:26 Uhr schrieb Chris Muller <[hidden email]>:
Hi Christoph,

Installer-cmm.436 replaces 435, which was a mistake I preferred to discard than permanently archive.  It's been treated it, if you simply Load 436 (instead of merge), it doesn't include 435 in its ancestry



Carpe Squeak!
Chris Muller-4
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: Unmerged trunk versions

Chris Muller-4
Hi Christoph, Happy New Year to you!  :)

I see, it is a bit confusing to read these unmerged versions in a Trunk repo. Don't we have any guidelines for this? Usual git approach would be to push a revert commit ...

Seeing it in the trunk repo has to do with a bug in its cache-handling, which should be fixed by Monticello-cmm.707.

Yes, Squeak does things a little differently.  MC's ancestry is an integrated structure, with a resource demand similar to a public blockchain.  Therefore, especially for the base system packages, emphasis should be placed on keeping this permanently archived artifact as compact as possible.  Thanks for your understanding.   :)

Best,
  Chris
 


> Not sure about Tools-ct.915, should it be merged or treated?


At least I never requested to treat it :) 

^ Year new beHappy :-)

Best,
Christoph
Von: Squeak-dev <[hidden email]> im Auftrag von Jakob Reschke <[hidden email]>
Gesendet: Mittwoch, 1. Januar 2020 18:11:02
An: Chris Muller; The general-purpose Squeak developers list
Betreff: Re: [squeak-dev] Unmerged trunk versions
 
Hi Chris,

To not mislead the tools I suggest to move the ex-Trunk version Installer-cmm.435 to the treated inbox.

Does 436 note the skipped number 435 in its message? Otherwise some future historian might wonder whether or why something is missing from the repositories.

Happy new year!
Kind regards,
Jakob

Am Mi., 1. Jan. 2020 um 00:26 Uhr schrieb Chris Muller <[hidden email]>:
Hi Christoph,

Installer-cmm.436 replaces 435, which was a mistake I preferred to discard than permanently archive.  It's been treated it, if you simply Load 436 (instead of merge), it doesn't include 435 in its ancestry
Free forum by Nabble Edit this page