diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form index 421e55dc9819..757acbf17742 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.form @@ -1,6 +1,6 @@
- + @@ -8,14 +8,6 @@ - - - - - - - - @@ -25,29 +17,52 @@ - + + - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java index badc713b8de2..b01b3790e299 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegratePanel.java @@ -32,6 +32,7 @@ public class SvnIntegratePanel extends AbstractSvnUpdatePanel{ private JCheckBox myUseAncestry; private DepthCombo myDepthCombo; private JLabel myDepthLabel; + private JPanel myAdditionalPanel; public SvnIntegratePanel(final SvnVcs vcs, Collection roots) { super(vcs); @@ -57,6 +58,11 @@ public class SvnIntegratePanel extends AbstractSvnUpdatePanel{ return myRootOptionsPanel; } + @Override + protected JPanel getAdditionalPanel() { + return myAdditionalPanel; + } + public void reset(final SvnConfiguration configuration) { super.reset(configuration); myDryRunCheckbox.setSelected(configuration.MERGE_DRY_RUN);