[squeak-dev] Unmerged trunk versions

Thiede, Christoph Christoph.Thiede at student.hpi.uni-potsdam.de
Wed Jan 1 18:46:59 UTC 2020


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 <squeak-dev-bounces at lists.squeakfoundation.org> im Auftrag von Jakob Reschke <forums.jakob at resfarm.de>
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 <asqueaker at gmail.com<mailto:asqueaker at gmail.com>>:
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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20200101/030dd0fe/attachment.html>


More information about the Squeak-dev mailing list