Christoph Thiede uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-ct.775.mcz
==================== Summary ====================
Name: Monticello-ct.775 Author: ct Time: 24 February 2022, 10:26:08.824123 pm UUID: ac420a9e-d609-344d-92cc-80dadf2eb06e Ancestors: Monticello-mt.774
Hardens time-stamp parsing against invalid/legacy/missing change stamps. MCMethodDefinition>>#fullTimeStamp will answer nil in this case, and when comparing conflicts, such definitions will be skipped.
=============== Diff against Monticello-mt.774 ===============
Item was changed: ----- Method: MCConflict>>isLocalNewer (in category 'testing') ----- isLocalNewer + ^ (self localDefinition fullTimeStamp ifNil: [^ false]) > self remoteDefinition fullTimeStamp! - ^ self localDefinition fullTimeStamp > self remoteDefinition fullTimeStamp!
Item was changed: ----- Method: MCConflict>>isRemoteNewer (in category 'testing') ----- isRemoteNewer + ^ (self localDefinition fullTimeStamp ifNil: [^ false]) < self remoteDefinition fullTimeStamp! - ^ self localDefinition fullTimeStamp < self remoteDefinition fullTimeStamp!
Item was changed: ----- Method: MCMethodDefinition>>fullTimeStamp (in category 'accessing') ----- fullTimeStamp + ^ [TimeStamp fromMethodTimeStamp: timeStamp] ifError: []! - ^TimeStamp fromMethodTimeStamp: timeStamp!
packages@lists.squeakfoundation.org