Implement equality checks for Targets. Don't consider equal targets as conflicting...

diff --git a/ConfigsController.m b/ConfigsController.m
index 0c32b8b..fb50bc3 100644 (file)
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -200,7 +200,8 @@
                           BOOL conflict;
                           Config *mergeInto = self[cfg.name];
                           for (id key in cfg.entries) {
                           BOOL conflict;
                           Config *mergeInto = self[cfg.name];
                           for (id key in cfg.entries) {

-                              if (mergeInto.entries[key]) {
+                              if (mergeInto.entries[key]
+                                  && ![mergeInto.entries[key] isEqual:cfg.entries[key]]) {

                                   conflict = YES;
                                   break;
                               }
                                   conflict = YES;
                                   break;
                               }

diff --git a/Target.m b/Target.m
index 700a151..493f94a 100644 (file)
--- a/Target.m
+++ b/Target.m
@@ -28,6 +28,15 @@
     return nil;    
 }
 
     return nil;    
 }
 

+- (BOOL)isEqual:(id)object {
+    return [object isKindOfClass:Target.class]
+        && [[self serialize] isEqual:[object serialize]];
+}
+
+- (NSUInteger)hash {
+    return [[self serialize] hash];
+}
+

 + (Target *)targetDeserialize:(NSDictionary *)serialization
                   withConfigs:(NSArray *)configs {
     // Don't crash loading old configs (but don't load them either).
 + (Target *)targetDeserialize:(NSDictionary *)serialization
                   withConfigs:(NSArray *)configs {
     // Don't crash loading old configs (but don't load them either).