You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by "Vldimir Orlyansky (JIRA)" <ji...@apache.org> on 2018/03/28 22:16:00 UTC
[jira] [Updated] (NETBEANS-541) Mercurial command Backout invokes
external tool for resolve conflict
[ https://issues.apache.org/jira/browse/NETBEANS-541?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Vldimir Orlyansky updated NETBEANS-541:
---------------------------------------
Description:
This Issue was found through NetCat 9
Windows 10.
JDK 8 and 10.
NetBeans build 379
Mercurial command Team-Recover-Backout invokes external tool for resolve conflict. In my case NetBeans invokes TortoiseSVN (Tortoise for subversion) diff.
Conflicts can be fixed by external tool. NetBeans can work with such "external" tool.
So problem is only one, NetBeans uses external tool for resolve modification instead using internal NetBeans tool for resolve conflicts.
was:
This Issue was found through NetCat 9
Mercurial command Team-Recover-Backout invokes external tool for resolve conflict. In my case NetBeans invokes TortoiseSVN (Tortoise for subversion) diff.
Conflicts can be fixed by external tool. NetBeans can work with such "external" tool.
So problem is only one, NetBeans uses external tool for resolve modification instead using internal NetBeans tool for resolve conflicts.
> Mercurial command Backout invokes external tool for resolve conflict
> --------------------------------------------------------------------
>
> Key: NETBEANS-541
> URL: https://issues.apache.org/jira/browse/NETBEANS-541
> Project: NetBeans
> Issue Type: Bug
> Components: versioncontrol - Mercurial
> Reporter: Vldimir Orlyansky
> Priority: Trivial
>
> This Issue was found through NetCat 9
> Windows 10.
> JDK 8 and 10.
> NetBeans build 379
> Mercurial command Team-Recover-Backout invokes external tool for resolve conflict. In my case NetBeans invokes TortoiseSVN (Tortoise for subversion) diff.
> Conflicts can be fixed by external tool. NetBeans can work with such "external" tool.
> So problem is only one, NetBeans uses external tool for resolve modification instead using internal NetBeans tool for resolve conflicts.
--
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