Usefull tools to compare and modify files

vot

In some cases it is not convenient to operate only with patches.
Some times I want to view two files at the same time and see the difference between them.

What the tool to use for that case?

I recommend to use  the "WinMerge".
WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.
It looks like two-window text editor.
For examle, your old file in a left window, and new edition file in a right window.
Moreover, both files are scrolled synchronously and all the differences between two files are highlighted.

You can simple edit left or right file, and move any difference from one window to other.



Where to use this tool?
For example, a code conflict may occure after a some SVN Update,
and appear TWO files instead of one original file.
I.e. you have modified the "lang_template.php", make SVN update, and fet a conflict.
As a result, your original lang_template.php disappear, but created two new files:
lang_template.php.mine and lang_template.php.r81
*.mine - it your old file.
*.rNN - it is a file from the repository.
Our goal in that case - to merge this two files into one lang_template.php.

If you are well known with the TortoiseSVN, you can merge files with it.

But if you are new with the TortoiseSVN,
it is the WinMerge, that can help us to do this job!

Download the latest WinMerge

vot

Yet another usefull tool for compare files and folders: MS WInDiff.
It is from from Microsoft Visual Studio and Windows XP Service Pack 2 Support Tools.
Description: http://windiff.softpedia.com/
Download page: http://www.softpedia.com/progDownload/WinDiff-Download-49639.html

This tool is very usefull to COMPARE two packages,
i.e. for explore what the files was modified in the next release.

How to use:

After run the program, choose from Menu: "File -> Compare Directories":



then enter the path to both folders:



The program will compare specified folders and list files that was modified in red color:



If you want to see what lines was modified in a modified file, just click on the red line!
(i.e. function_post.php in this example)

justinster123

vot replied at 2011-10-18 11:54
Yet another usefull tool for compare files and folders: MS WInDiff.
It is from from Microsoft Visual ...

is there a tool for mac os x?

vot

I think there is.
Search in Google:
mac os diff tools