Changeset 649

Show
Ignore:
Timestamp:
07/30/08 17:26:45 (4 months ago)
Author:
gbooker
Message:

Set a merge policy since we already have two apps that modify things. This should reduce save errors

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

    r636 r649  
    255255        moc = [[NSManagedObjectContext alloc] init]; 
    256256        [moc setUndoManager:nil]; 
     257        [moc setMergePolicy:NSMergeByPropertyObjectTrumpMergePolicy]; 
    257258        NSString *mopath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Sapphire" ofType:@"mom"]; 
    258259        NSURL *mourl = [NSURL fileURLWithPath:mopath];