From 8766496f26a0f6a1354e28ebbbcf1298e57b2246 Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 6 Feb 2012 12:09:21 +0400 Subject: [PATCH] SVN 1.7: resolve conflict (as merged) - to work --- .../org/jetbrains/idea/svn17/actions/MarkResolvedAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/MarkResolvedAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/MarkResolvedAction.java index a8fb65a03d36..14c7e6ccd36a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/MarkResolvedAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/MarkResolvedAction.java @@ -33,6 +33,7 @@ import org.jetbrains.idea.svn17.SvnBundle; import org.jetbrains.idea.svn17.SvnStatusUtil; import org.jetbrains.idea.svn17.SvnVcs17; import org.jetbrains.idea.svn17.dialogs.SelectFilesDialog; +import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.wc.*; @@ -90,7 +91,7 @@ public class MarkResolvedAction extends BasicAction { SVNWCClient wcClient = vcs.createWCClient(); for (String path : pathsArray) { File ioFile = new File(path); - wcClient.doResolve(ioFile, false); + wcClient.doResolve(ioFile, SVNDepth.EMPTY, SVNConflictChoice.MERGED); } } catch (SVNException e) {