diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java
index 99f956ef775e..a8aa44dae7ff 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java
@@ -36,6 +36,7 @@ import static com.intellij.testFramework.UsefulTestCase.assertExists;
 import static com.intellij.util.containers.ContainerUtil.ar;
 import static com.intellij.vcsUtil.VcsUtil.getFilePath;
 import static java.util.Arrays.asList;
+import static org.jetbrains.idea.svn.SvnUtil.getRelativeUrl;
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
@@ -192,8 +193,14 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase {
                         StatusType.STATUS_MODIFIED.equals(status.getNodeStatus())));
           }
         }
-        assertTrue(createTestFailedComment(exFile.getPath()) + " (modified text status)",
-                   status != null && file.myContentsStatus.equals(status.getContentsStatus()));
+        if (file.myCopyFrom != null) {
+          assertTrue(createTestFailedComment(exFile.getPath()) + " (copied status)",
+                     status != null && file.myCopyFrom.equals(getRelativeUrl(myRepositoryUrl, status.getCopyFromURL())));
+        }
+        else {
+          assertTrue(createTestFailedComment(exFile.getPath()) + " (modified text status)",
+                     status != null && file.myContentsStatus.equals(status.getContentsStatus()));
+        }
       }
     }
   }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java
index 64822ab56105..387df315870d 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java
@@ -27,8 +27,10 @@ public interface TreeConflictData {
                                             "@@ -1,1 +0,0 @@\n" +
                                             "-123\n" +
                                             "\\ No newline at end of file\n", "root/source/s1.txt",
+                                            // Status after resolve mine-full - added + copied from previous revision
                                             new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL,
-                                                         StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false));
+                                                         StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false,
+                                                         "root/source/s1.txt"));
     Data MINE_DELETE_THEIRS_EDIT = new Data("Index: root/source/s1.txt\n" +
                                             "===================================================================\n" +
                                             "--- root/source/s1.txt\t(revision 358)\n" +
@@ -46,9 +48,9 @@ public interface TreeConflictData {
                                           "--- root/source/s1.txt\t(revision 358)\n" +
                                           "+++ root/source/s1renamed.txt\t(revision )\n" +
                                           "@@ -1,0 +1,0 @@\n", "root/source/s1.txt",
+                                          // Status after resolve mine-full - added + copied from previous revision
                                           new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL,
-                                                       StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false));
-
+                                                       StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false, "root/source/s1.txt"));
     Data MINE_UNV_THEIRS_MOVE = new Data("Index: root/source/s1.txt\n" +
                                           "===================================================================\n" +
                                           "--- root/source/s1.txt\t(revision 358)\n" +