From 8910c2c482e8780eda18806790c6453e1a4b27db Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 20 Jan 2015 15:48:58 +0100
Subject: [PATCH] DDC-2704 - data should be merged only into initialized
 proxies

---
 lib/Doctrine/ORM/UnitOfWork.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 6e1d5428b..a09bf1cc1 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1868,6 +1868,10 @@ class UnitOfWork implements PropertyChangedListener
             $visited[$oid] = $managedCopy; // mark visited
 
             if (!($entity instanceof Proxy && ! $entity->__isInitialized())) {
+                if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized()) {
+                    $managedCopy->__load();
+                }
+
                 $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
             }