Sensei
- Join Date:
- Jan 2004
- Posts:
- 63,515
- Plugin Contributions:
- 176
Using WinMerge
Using WinMerge
You can install WinMerge by downloading the latest version from their website at: http://winmerge.sf.net
After installing, run it.
**To compare files **press CTRL-O (File | Open) and choose the desired individual files to compare.
Or, drag-and-drop files from an explorer window onto the WinMerge window. The 2nd file you drag onto WinMerge needs to be dragged onto the 2nd filename box.
Click OK, and the files' contents will be compared, with differences highlighted.
There are arrow buttons in the navigation bar to allow you to move down and up thru known differences, and left/right to copy text from one to the other.
ESC exits. If you've made any changes, you'll be prompted to save them, for both files (if relevant).
When comparing, if you see only left-side or right-side files, click on the "View" menu and choose "Show Different Items".
Probably best to not choose "Show Identical Items" because if the files are identical, you don't need to review them.
**To compare entire folders, **do the same as for files above, but only enter folder names (or drag-and-drop). BE SURE TO CHECK THE "Recursive" CHECKBOX so that it knows to compare files in subdirectories too.
You'll see a list of files after comparison. Under the "View" menu, deselect "Identical Files". You can optionally enable/disable left/right comparison results too.
To look at diff's in displayed files, double-click or press Enter on a highlighted entry. Edit as described above for individual file diff's.
**
Preventing it from flagging line-endings as changes**
If your FTP program mangles your files by changing line-endings, you'll want to tell WinMerge to ignore carriage return differences.
Optional Configuration:
Choose Tools | Filters | Linefilters tab and check the "Ignore lines..." box, and enter this:
(Prior to WinMerge v2.2, choose: Edit | Options | Filters and check the RegEx box)
//.*
[/]{2}.*[\|\+]*
[/]{2}\s*\$[\s]?Id: .*\$
^ \* @version \$Id:.*\$
#\s*\$[\s]?Id: .*
```This will tell WinMerge to ignore commented text as well as common header components in each file.
This allows comparing between ZC release versions without having to worry about files that only have changes in the headers or in commented text.
*In terms of replying to this post, please keep discussion only to issues regarding WinMerge. If you have questions about Zen Cart or editing Zen Cart files or Upgrading Zen Cart, please post those in a separate thread. Thanks!*
.
Zen Cart - putting the dream of business ownership within reach of anyone!
Donate to: DrByte directly or to the Zen Cart team as a whole
Remember: Any code suggestions you see here are merely suggestions. You assume full responsibility for your use of any such suggestions, including any impact ANY alterations you make to your site may have on your PCI compliance.
Furthermore, any advice you see here about PCI matters is merely an opinion, and should not be relied upon as "official". Official PCI information should be obtained from the PCI Security Council directly or from one of their authorized Assessors.
