Mantis Bugtracker
  

Viewing Issue Advanced Details Jump to Notes ] View Simple ] Issue History ] Print ]
ID Category Severity Reproducibility Date Submitted Last Update
0007788 [Squeak] Monticello minor always 09-20-13 11:02 09-20-13 11:02
Reporter FrankShearar View Status public  
Assigned To avi
Priority normal Resolution open Platform
Status assigned   OS
Projection none   OS Version
ETA none Fixed in Version Product Version trunk
  Product Build
Summary 0007788: MCConflict >> #chooseNewer doesn't always resolve conflicts
Description 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.
Steps To Reproduce
Additional Information
Attached Files

- Relationships

- Notes
(0014449 - 85 - 85 - 85 - 85 - 85 - 85)
FrankShearar
09-20-13 11:02

This is not a theoretical problem: I've seen it breaking CI's update-image.st script.
 

- Issue History
Date Modified Username Field Change
09-20-13 11:02 FrankShearar New Issue
09-20-13 11:02 FrankShearar Status new => assigned
09-20-13 11:02 FrankShearar Assigned To  => avi
09-20-13 11:02 FrankShearar Note Added: 0014449


Mantis 1.0.8[^]
Copyright © 2000 - 2007 Mantis Group
34 total queries executed.
29 unique queries executed.
Powered by Mantis Bugtracker