This gives me a base to build on if I want to add certain keybind features later on.īoth FileEdits are being managed by a "FileManager". This class is the GUI class at the same time, and receives events like button press, clicks etc. The current implementation I have in mind looks like this:Įach edit control is an object of "FileEdit". I could kind of add a reference to the file which I want to compare the original file to in the class of the original file, but I would rather have a dedicated class responsible for all managing and comparing. Of course, I could just add a method to make them load their file, and display it, but that won't help, as I'm not writing an editor, but rather a comparison tool. I have a custom control for each of the 2 edit controls, which are showing the respective file content. However, I am now sitting here, thinking about a design on how to manage the whole file comparison and the data flow. I am using C++ with the Win32-API (WTL, ATL, that stuff), and I already designed an UI for this. ( ).My current project is to implement a kind of WinMerge clone to compare two files. And the line filters must be checked and enabled. For example, dragging your branch version of ROMS and the trunk version of ROMS into WinMerge works fine.Īlso, the File Compare method must be Full Contents (found under Options.Compare). The workaround for this annoying feature is to initiate file comparisons at a lower level. \trunk_version\ROMS\Nonlinear\sediment.F and you start the WinMerge comparison by opening directories my_code and trunk_version, WinMerge will mark files with the svn tag with "Files are different", but when you open them, the "Files are identical" box will open. Say your ROMS repository is in a directory called. The line filters don't work properly to eliminate comparison of lines with version control tags like ! svn $Id: in WinMerge 2.10.02.
# (Inline comments begin with " #" and extend to the end of the line)
# (it lets through everything not specified) # This filter suppresses various files found in subversion # This is a directory/file filter for WinMerge :Ĭ:\Program Files\Winmerge\Filters\subversion.flt and load it from the Settings.Filters menu. To prevent WinMerge from finding meaningless differences in Subversion files, add these commands under.
0 kommentar(er)
