Mantis - Squeak
Viewing Issue Advanced Details
7788 Monticello minor always 09-20-13 11:02 09-20-13 11:02
FrankShearar  
avi  
normal  
assigned trunk  
open  
none    
none  
0007788: MCConflict >> #chooseNewer doesn't always resolve conflicts
It looks like the logic's not exhaustive:

chooseNewer
    self isLocalNewer ifTrue: [ self chooseLocal ]
        ifFalse: [ self isRemoteNewer ifTrue: [ self chooseRemote ]]

Except, if self isLocalNewer not and: [self isRemoteNewer not] then you haven't chosen anything.

Notes
(0014449)
FrankShearar   
09-20-13 11:02   
This is not a theoretical problem: I've seen it breaking CI's update-image.st script.