From b9a2f96d6e2306543c27803fbf2ed7bab776dade Mon Sep 17 00:00:00 2001
From: John Rommel Estropia <rommel.estropia@gmail.com>
Date: Sat, 7 May 2016 12:04:59 +0800
Subject: [PATCH] renamed refreshAllObjectsAsFaults to
 refreshAndMergeAllObjects, which is more correct

---
 CoreStore/Internal/NSManagedObjectContext+Transaction.swift | 4 ++--
 CoreStore/Saving and Processing/BaseDataTransaction.swift   | 4 ++--
 CoreStore/Saving and Processing/CoreStore+Transaction.swift | 4 ++--
 CoreStore/Saving and Processing/DataStack+Transaction.swift | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
index e64332c..8a911a1 100644
--- a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
@@ -167,7 +167,7 @@ internal extension NSManagedObjectContext {
         }
     }
     
-    internal func refreshAllObjectsAsFaults() {
+    internal func refreshAndMergeAllObjects() {
         
         if #available(iOS 8.3, OSX 10.11, *) {
             
@@ -175,7 +175,7 @@ internal extension NSManagedObjectContext {
         }
         else {
             
-            self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: false) }
+            self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: true) }
         }
     }
     
diff --git a/CoreStore/Saving and Processing/BaseDataTransaction.swift b/CoreStore/Saving and Processing/BaseDataTransaction.swift
index 20d9fb8..54778d3 100644
--- a/CoreStore/Saving and Processing/BaseDataTransaction.swift	
+++ b/CoreStore/Saving and Processing/BaseDataTransaction.swift	
@@ -191,14 +191,14 @@ public /*abstract*/ class BaseDataTransaction {
     /**
      Refreshes all registered objects `NSManagedObject`s in the transaction.
      */
-    public func refreshAllObjectsAsFaults() {
+    public func refreshAndMergeAllObjects() {
         
         CoreStore.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to refresh entities outside their designated queue."
         )
         
-        self.context.refreshAllObjectsAsFaults()
+        self.context.refreshAndMergeAllObjects()
     }
     
     
diff --git a/CoreStore/Saving and Processing/CoreStore+Transaction.swift b/CoreStore/Saving and Processing/CoreStore+Transaction.swift
index 2023d46..b1cf3d8 100644
--- a/CoreStore/Saving and Processing/CoreStore+Transaction.swift	
+++ b/CoreStore/Saving and Processing/CoreStore+Transaction.swift	
@@ -66,9 +66,9 @@ public extension CoreStore {
     /**
      Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
      */
-    public static func refreshAllObjectsAsFaults() {
+    public static func refreshAndMergeAllObjects() {
         
-        self.defaultStack.refreshAllObjectsAsFaults()
+        self.defaultStack.refreshAndMergeAllObjects()
     }
     
     @available(*, deprecated=1.3.1, renamed="beginUnsafe")
diff --git a/CoreStore/Saving and Processing/DataStack+Transaction.swift b/CoreStore/Saving and Processing/DataStack+Transaction.swift
index 9277d8b..80bcb7c 100644
--- a/CoreStore/Saving and Processing/DataStack+Transaction.swift	
+++ b/CoreStore/Saving and Processing/DataStack+Transaction.swift	
@@ -83,14 +83,14 @@ public extension DataStack {
     /**
      Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
      */
-    public func refreshAllObjectsAsFaults() {
+    public func refreshAndMergeAllObjects() {
         
         CoreStore.assert(
             NSThread.isMainThread(),
             "Attempted to refresh entities outside their designated queue."
         )
         
-        self.mainContext.refreshAllObjectsAsFaults()
+        self.mainContext.refreshAndMergeAllObjects()
     }
     
     @available(*, deprecated=1.3.1, renamed="beginUnsafe")