Comparing sources: Difference between revisions
no edit summary
Hellboy1975 (talk | contribs) No edit summary |
Hellboy1975 (talk | contribs) No edit summary |
||
| Line 1: | Line 1: | ||
== | '''File Comparison''' is the process of compare the difference between files. Commonly this is used when merging source code with a [[Version Control]] file repository. | ||
==Why use File Comparison Software?== | |||
When comparing source between different Visual DataFlex versions it is a HUGE time saver to do this using source code compare tools. | When comparing source between different Visual DataFlex versions it is a HUGE time saver to do this using source code compare tools. | ||
Below is a few rules one can use to compare sources between VDF11.1 and VDF12.1 | Below is a few rules one can use to compare sources between VDF11.1 and VDF12.1 | ||
The tips below are for a product called '''Beyond Compare''', but i'm sure your product will do fine too. If you are not using a product for this then GO BUY ONE! it is the best investment you can make EVER. | The tips below are for a product called '''Beyond Compare''', but i'm sure your product will do fine too. If you are not using a product for this then GO BUY ONE! it is the best investment you can make EVER. | ||
Meld | ==File Comparison software== | ||
There are many different file comparison tools out there, the most commonly used being '''Beyond Compare'''. Other alternatives for Windows include Araxis merge, WinDiff and Winmerge. | |||
For [[Linux]] users there is Meld. | |||
For a comparison of file comparison tools visit [http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools Wikipedia]. | |||
==Beyond Compare== | |||
Beyond Compare is a commonly used File Comparison tool developed by Scooter Software. | |||
=== How-to set up Beyond Compare === | === How-to set up Beyond Compare === | ||
| Line 47: | Line 57: | ||
(?i)^\s*local\s+string.*|^\s*string.* | (?i)^\s*local\s+string.*|^\s*string.* | ||
Replace string with date / integer / number to filter other similar code. | Replace string with date / integer / number to filter other similar code. | ||
==Winmerge== | |||
Winmerge is an [[Open Source]] file comparison tool. | |||
==External Links== | ==External Links== | ||
| Line 52: | Line 65: | ||
*[http://winmerge.org/ Winmerge] | *[http://winmerge.org/ Winmerge] | ||
*[http://www.araxis.com/ Araxis] | *[http://www.araxis.com/ Araxis] | ||
[[Category:Development Tools]] | |||