Niklas Matthies created NETBEANS-629: ----------------------------------------
Summary: Merge dialog is out of date Key: NETBEANS-629 URL: https://issues.apache.org/jira/browse/NETBEANS-629 Project: NetBeans Issue Type: Bug Components: versioncontrol - Subversion Reporter: Niklas Matthies The Merge dialog (Team –> Copy –> Merge to...) is out of date with respect to SVN 1.8+, because --reintegrate has been deprecated and SVN now performs automatic reintegration merge (cf. [https://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate|https://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate).]). The "Reintegrate Feature Branch" should be removed for SVN 1.8+ clients, and the "One Repository Folder Since Its Origin" option should become the default and maybe should be renamed and/or the preview picture be changed to account for automatic reintegration merge. -- This message was sent by Atlassian JIRA (v7.6.3#76005) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists