MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SVN 1.7: resolve conflict (as merged) - to work

Browse Source
This commit is contained in:
irengrig
2012-02-07 13:08:47 +04:00
parent 25f2995cb7
commit 8766496f26
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn17/actions/MarkResolvedAction.java
+2 -1
View File
@@ -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) {