485
edits
File Comparison: Difference between revisions
m
→Custom filters
Hellboy1975 (talk | contribs) (New page: '''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 Co...) |
m (→Custom filters) |
||
| (8 intermediate revisions by 2 users not shown) | |||
| Line 18: | Line 18: | ||
=== How-to set up Beyond Compare === | === How-to set up Beyond Compare === | ||
In order to change the rules on how BC compares, you should go into compare source mode and then click on the "guy with the cap" in the toolbar | |||
==== Configure File Formats ==== | |||
In order to have Beyond Compare recognize DataFlex based on File Type, you can add the following after starting the main program. | |||
Main menu -> Tools -> File Formats -> Press the "+" button to add a new file format --> Text Format | |||
General tab | |||
Mask: *.src;*.pkg;*.dg;*.vw;*.dd;*.sl;*.ddo;*.rv;*.tt?;*.wo;*.utl;*.nui | |||
Description: - Compares DataFlex source. | |||
Save As: DataFlex Source | |||
==== Configure per session ==== | |||
In order to change the rules on how BC compares, you should go into compare source mode --> compare two source files --> and then click on the "guy with the cap" in the toolbar | |||
''' General Tab Page ''' | ''' General Tab Page ''' | ||
| Line 57: | Line 70: | ||
(?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. | ||
7. Ignore meta tag documentation changes between 12.1 and 2008 | |||
Click on Regular expressions | |||
(?i)\s*\/\/Doc\/.*|\s*\{.* | |||
8. Ignore the public keyword in property declarations | |||
Click on Regular expressions | |||
(?i)^\s*property\s+integer.*public.*|^\s*property\s+integer.* | |||
Repeat the same for the other datatypes | |||
9. Comment vs. No comments | |||
Click On Regex | |||
(?i)^\s*\/\/.*|^\s* | |||
10. Use statement vs missing Use statement | |||
As before a regular expression | |||
(?i)^\s*Use.*\.pkg|^\s* | |||
11. Ignore removed comments after End_Object,End_Class,End_Function,End_Procedure | |||
Using a regular expressions | |||
(?i)\s*end.*\/\/.*|\s*end.* | |||
PS: Begin this year I was promised by Scootersoftware Support that they would implement a way to enable/disable filters on a per filter bases in the next revision of the tool. <--- I wrote that in 2008! This was implemented by using sessions. You can create different sessions with different filters. | |||
==Winmerge== | ==Winmerge== | ||
| Line 67: | Line 104: | ||
[[Category:Development Tools]] | [[Category:Development Tools]] | ||
[[Category: Version Control]] | |||