You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@netbeans.apache.org by "Niklas Matthies (JIRA)" <ji...@apache.org> on 2018/04/09 23:30:00 UTC

[jira] [Created] (NETBEANS-629) Merge dialog is out of date

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-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists