diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java index cb62668cbb25..73346ad4af66 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/GroupMerger.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnConfiguration; import org.jetbrains.idea.svn.SvnVcs; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.update.UpdateEventHandler; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc.SVNRevision; @@ -131,7 +131,7 @@ public class GroupMerger implements IMerger { SvnTarget source = SvnTarget.fromURL(myCurrentBranchUrl); MergeClient client = myVcs.getFactory(myTarget).createMergeClient(); - client.merge(source, createRange(), myTarget, SVNDepth.INFINITY, mySvnConfig.isMergeDryRun(), myDryRun, true, + client.merge(source, createRange(), myTarget, Depth.INFINITY, mySvnConfig.isMergeDryRun(), myDryRun, true, mySvnConfig.getMergeOptions(), myHandler); } |