Please feel free to update me if I miss something in blog post. Especially programming, control engineering, artificial intelligent and math. No many things to write about me here, except the one who enjoy feeding koi fish and have interest in computer technology. ![]() Please enable JavaScript to view the comments powered by Disqus. So for now and so on in this blog post, WinMerge term means WinMerge 2.x.Īfter installing WinMerge, to configure it as diff and merge tool of Git is by adding /editing the following config setting to C:\Users\\.gitconfig ![]() You can use the same tool in Windows and in Linux. It will be based on Qt library and cross-platform. WinMerge 3 will be modern compare/synchronization tool. It can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.Īt the time of writing this blog post, WinMerge 3 is still in progress of development and no release yet. WinMerge is an open source differencing and merging tool for Windows. gitconfig and manually add the config code. cmd = "diffmerge -merge -result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\" then echo \"$BASE\" else echo \"$LOCAL\" fi)\" \"$REMOTE\"" trustExitCode = true cmd = diffmerge \" $LOCAL \" \" $REMOTE \" tool = diffmerge prompt = false keepBackup = false keepTemporaries = false tool = diffmerge It will require some scripting or programming.1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 Yes please create a new topic, I have some ideas to hack Plastic in order to achieve what you want. ![]() PS: Should I create a separate thread for this.? It might be an interesting subject of discussion to import historical archive material and have it show up connected in Branch Explorer.Ĭan you get Amalia (from here) to also look at this post/ question. then this would be a Simple Custom structure to IMPORT. If you can import-export with other revision control systems ( and their structures) such as Git, etc. I am guessing some of the brilliant people at Plastic SCM might have already tried something like this. I dont mind writing some code/ script against Plastic SCM API to IMPORT these "versions" and "variations" into the RECORDS / SYSTEM managed by Plastic SCM. Now, I know this may not be standard - But I believe you have a "data structure" via which you TimeStamp versions
0 Comments
Leave a Reply. |