8/12/2023 0 Comments Araxis merge command line options![]() So first item we should address IMHO is that the code should "know" if a tool is system dependent and don’t enable it in wrong environment. For example araxis tool that provides "compare" command on Windows (which is compare.exe actually), seem to be "available" on my Linux box (where compare is coming from completely unrelated image magic toolset), but of course fails to work as a diff tool. In fact, many of them most likely are coming from Windows based environment. Since they were used / proposed by Andre, I felt not OK to remove them. That's better, but I'd still expect a normal Eclipse error status dialog telling me "Could not run merge tool 'emerge', exit code 1: emacs: standard input is not a tty".ĭefault tools are coming from patches on bug 356832. ![]() diffmergetool.ToolException: JGit: tool execution return code: 1Īt .(CommandExecutor.java:84)Īt .(MergeTools.java:207)Īt .(MergeTools.java:165)Īt .(MergeToolActionHandler.java:197)Īt .(MergeToolActionHandler.java:138)Īt .(MergeToolActionHandler.java:134)Īt .(MergeToolActionHandler.java:123)Īt .(MergeToolActionHandler.java:98) ![]() Eclipse should not be blocked waiting for the external merge tool to finish?ĭon't know what's different now (switched to opendiff and back to emerge), but with EGit 6.2.0 I now get in step 2: There should be a way to say "Use the built-in Eclipse compare editor as fallback if the external tool fails".ĥ. The temporary files are be removed at the end.Ĥ. The user should get an error dialog telling about the failure.ģ. If I have no merge tools configured anywhere, I should not be able to select anything from "External, use this tool".Ģ. Eclipse is blocked (shows the spinning cursor).ġ. Having chosen "opendiff": lauches some "FileMerge" Mac application. The BASE, LOCAL, REMOTE files are not removed they are still there after the failure and shown as untracked new files in the git staging view.Ĥ. There is no indication in the UI that something went wrong.ģ. diffmergetool.ToolException: External merge tool is not defined: noneĪt .(MergeTools.java:161)Īt .(MergeToolActionHandler.java:201)Īt .(MergeToolActionHandler.java:133)Īt .(MergeToolActionHandler.java:129)Īt .(MergeToolActionHandler.java:119)Īt .(MergeToolActionHandler.java:96) !MESSAGE Failed to run external merge tool. Having chosen "emerge" (there is no such application on my system): when double-clicking a merge conflict file in the git staging view, EGit generates the BASE, LOCAL, REMOTE files in the workspace, and then logs an error Where do these entries come from? I don't see anything in my git config (including the system config).Ģ. On the Diff/Merge tools preference page I get under "External, use this tool" the choices "emerge", "opendiff", "vimdiff", "vimdiff2", and "vimdiff3".ġ. I have not configured anything for external merge tools.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |