hadesz Posted April 1, 2014 Report Share Posted April 1, 2014 Hello, I've configured the tool as shown on http://www.semanticmerge.com/documentation/main.shtml#CommandLineClientConfiguration of course updated the path and others. I've run into 2 errors: There were line ending errors, and some changes in the class annotation, and the tool cannot solve it via intelligent way, and the text merge tool cannot started "no text merge tool have been specified" Some png's are missing from /opt/semanticmerge/icons/java GLib.GException: Failed to open file '/opt/semanticmerge/icons/java/namespace.png': No such file or directory at Gdk.Pixbuf..ctor (System.String filename) [0x00000] in <filename unknown>:0 at SemanticGtk.DeclarationImages.GetPixbuf (e6 declaration, Language fileLanguage) [0x00000] in <filename unknown>:0 at SemanticGtk.TreeBuilder.b (Gtk.TreeViewColumn A_0, Gtk.CellRenderer A_1, TreeModel A_2, TreeIter A_3) [0x00000] in <filename unknown>:0 at GtkSharp.TreeCellDataFuncWrapper.NativeCallback (IntPtr tree_column, IntPtr cell, IntPtr tree_model, IntPtr iter, IntPtr data) [0x00000] in <filename unknown>:0 GLib.GException: Failed to open file '/opt/semanticmerge/icons/java/namespace.png': No such file or directory at Gdk.Pixbuf..ctor (System.String filename) [0x00000] in <filename unknown>:0 at SemanticGtk.DeclarationImages.GetPixbuf (e6 declaration, Language fileLanguage) [0x00000] in <filename unknown>:0 at SemanticGtk.TreeBuilder.b (Gtk.TreeViewColumn A_0, Gtk.CellRenderer A_1, TreeModel A_2, TreeIter A_3) [0x00000] in <filename unknown>:0 at GtkSharp.TreeCellDataFuncWrapper.NativeCallback (IntPtr tree_column, IntPtr cell, IntPtr tree_model, IntPtr iter, IntPtr data) [0x00000] in <filename unknown>:0 GLib.GException: Failed to open file '/opt/semanticmerge/icons/java/namespace.png': No such file or directory at Gdk.Pixbuf..ctor (System.String filename) [0x00000] in <filename unknown>:0 at SemanticGtk.DeclarationImages.GetPixbuf (e6 declaration, Language fileLanguage) [0x00000] in <filename unknown>:0 at SemanticGtk.TreeBuilder.b (Gtk.TreeViewColumn A_0, Gtk.CellRenderer A_1, TreeModel A_2, TreeIter A_3) [0x00000] in <filename unknown>:0 at GtkSharp.TreeCellDataFuncWrapper.NativeCallback (IntPtr tree_column, IntPtr cell, IntPtr tree_model, IntPtr iter, IntPtr data) [0x00000] in <filename unknown>:0 Link to comment Share on other sites More sharing options...
vsanchezm Posted April 1, 2014 Report Share Posted April 1, 2014 Hi, Thanks for your feedback. Could you give us more information about your first error? I don't know what you mean, sorry Regarding the second problem, we are building a new package with the missing images right now. It will be available in more or less one hour. Anyway, I attach here the missing images in case you prefer not to wait. Just copy them into /opt/semanticmerge/icons/java. Sorry for the inconveniences. Regards, Violeta. Link to comment Share on other sites More sharing options...
hadesz Posted April 4, 2014 Author Report Share Posted April 4, 2014 The original problem: there were only line endings differences in the files, and i think it could be solved without any user action. Then i tried to run text merge, but i got error message. thank you Link to comment Share on other sites More sharing options...
vsanchezm Posted April 8, 2014 Report Share Posted April 8, 2014 They are not error messages. The messages say that you don't have any external based-text tool configured yet. We don't provide a default external tool in Linux (as we do in Windows) because we don't have a native one yet. If you want to use our merge tool you can install it from PlasticSCM, it is included, but it needs mono to run. So the matter is only you to configure an external tool for diffing and merging. In our documentation you have kdiff3 as example. -edt="kdiff3 ""#sourcefile"" ""#destinationfile""" -emt="kdiff3 -b=""#basefile"" ""#sourcefile"" ""#destinationfile"" --L1 ""#basesymbolic"" --L2 ""#sourcesymbolic"" --L3 ""#destinationsymbolic"" -o ""#output""" Use the "semanticmergetool.conf" file sited in your user directory in the .semanticmerge directory. Regarding the line endings, we are working on it! Thanks for your feedback! Let me know if you need any further info. Violeta Link to comment Share on other sites More sharing options...
hadesz Posted April 8, 2014 Author Report Share Posted April 8, 2014 Thank you for your answer, i've checked my ~/.semanticmerge folder, but there is only a lic file... Link to comment Share on other sites More sharing options...
vsanchezm Posted April 8, 2014 Report Share Posted April 8, 2014 Create the file "semanticmergetool.conf" in that folder and specify one option per line, that's it Keeping same example as before, your config file will look like the following. Do not forget to set correctly the path of the external tool, or the one you choose semanticmergetool.conf example -edt="kdiff3 ""#sourcefile"" ""#destinationfile""" -emt="kdiff3 -b=""#basefile"" ""#sourcefile"" ""#destinationfile"" --L1 ""#basesymbolic"" --L2 ""#sourcesymbolic"" --L3 ""#destinationsymbolic"" -o ""#output""" Link to comment Share on other sites More sharing options...
vsanchezm Posted April 8, 2014 Report Share Posted April 8, 2014 Check the doc at http://www.semanticmerge.com/documentation/main.shtml#Launchoptionsconfigurationfile Link to comment Share on other sites More sharing options...
hadesz Posted April 9, 2014 Author Report Share Posted April 9, 2014 I used .gitconfig for first try, that's why i didn't see this kind of configuration. Thank you, hadesz Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.