Changeset 621

Show
Ignore:
Timestamp:
07/04/08 22:09:46 (6 months ago)
Author:
gbooker
Message:

More of the last commit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

    r619 r621  
    242242{ 
    243243        NSManagedObjectContext *moc = [self managedObjectContext]; 
    244         [moc refreshObject:self mergeChanges:YES]; 
     244        [moc refreshObject:self mergeChanges:NO]; 
    245245         
    246246        [importArray release]; 
    …… 
    557557        objEnum = [self.metaFilesSet objectEnumerator]; 
    558558        while((obj = [objEnum nextObject]) != nil) 
    559                 [moc refreshObject:obj mergeChanges:YES]; 
     559                [moc refreshObject:obj mergeChanges:NO]; 
    560560         
    561561        objEnum = [self.metaDirsSet objectEnumerator]; 
    562562        while((obj = [objEnum nextObject]) != nil) 
    563                 [moc refreshObject:obj mergeChanges:YES]; 
     563                [moc refreshObject:obj mergeChanges:NO]; 
    564564         
    565565        objEnum = [self.linkedFilesSet objectEnumerator]; 
    566566        while((obj = [objEnum nextObject]) != nil) 
    567                 [moc refreshObject:obj mergeChanges:YES]; 
     567                [moc refreshObject:obj mergeChanges:NO]; 
    568568         
    569569        objEnum = [self.linkedDirsSet objectEnumerator]; 
    570570        while((obj = [objEnum nextObject]) != nil) 
    571                 [moc refreshObject:obj mergeChanges:YES]; 
    572          
    573         [moc refreshObject:self mergeChanges:YES]; 
     571                [moc refreshObject:obj mergeChanges:NO]; 
     572         
     573        [moc refreshObject:self mergeChanges:NO]; 
    574574} 
    575575