Forums / Upgrading to 1.5.x / Winmerge - is there a way to have only the text highlighted that is different?

Winmerge - is there a way to have only the text highlighted that is different?

Started by sendmenews on 4 Oct 2016, 10:36 PM · Views: 3,894

Results 1 to 6 of 6
4 Oct 2016, 10:36 PM
#1
sendmenews avatar

sendmenews

Zen Follower

Join Date:
May 2008
Posts:
122
Plugin Contributions:
0

Winmerge - is there a way to have only the text highlighted that is different?

I am finding when i am using winmerge that it will say text is different and it appears the only difference is the line spacing.

Is there a way I can have ONLY the actual text highlighted that is different and nothing else. I do not need to know that there is an extra blank line.

I am wanting to find the actual coding that I changed in my old zencart store by comparing it to the old original (unedited) zencart files. I feel that this will help me with changing things to the updated zencart files because It has been so long since I did anything with this and hopefully it will jog my memory.

5 Oct 2016, 3:27 AM
#2
drbyte avatar

drbyte

Sensei

Join Date:
Jan 2004
Posts:
63,511
Plugin Contributions:
176

Re: Winmerge - is there a way to have only the text highlighted that is different?

Ya, you can tell it to skip showing files that match, and also tell it to ignore line-ending differences.

Some tips on configuring it here: Using WinMerge

.
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.

5 Oct 2016, 10:25 PM
#3
lightbrown avatar

lightbrown

New Zenner

Join Date:
Jun 2015
Location:
California
Posts:
54
Plugin Contributions:
0

Re: Winmerge - is there a way to have only the text highlighted that is different?

In Winmerge, go to Edit -> Options

Then check the Ignore Blank Lines box and the Ignore Carriage Return Differences box.

Also, your may want to set up your ftp program to do all transfers in binary mode. Certain server setups code carriage returns differently. So downloading and uploading the same file in Text mode can have the effect of adding blank lines between every line of code. This issue should go away if you switch to binary mode for uploads and downloads.

6 Oct 2016, 2:15 AM
#4
sendmenews avatar

sendmenews

Zen Follower

Join Date:
May 2008
Posts:
122
Plugin Contributions:
0

Re: Winmerge - is there a way to have only the text highlighted that is different?

DrByte:

Ya, you can tell it to skip showing files that match, and also tell it to ignore line-ending differences.

Some tips on configuring it here: Using WinMerge

Thanks for the information.....after looking at everything I am thinking i might have someone do the upgrade for me. Any recommendations:) Not sure if that is a conflict for you:unsure:

6 Oct 2016, 3:29 AM
#5
dbltoe avatar

dbltoe

Totally Zenned

Join Date:
Jan 2004
Location:
N of San Antonio TX
Posts:
9,899
Plugin Contributions:
22

Re: Winmerge - is there a way to have only the text highlighted that is different?

If you follow the method at https://www.zen-cart.com/entry.php?3-How-do-I-rebuild-my-site-on-the-new-version-instead-of-upgrading, there's really not much of a need for winmerge.

Need a hand with Zen Cart? Hire the team at myZenCartZone.com for upgrades, repairs, and custom plugins.
Zen Cart Certified hosting at myZenCartHost.com

6 Oct 2016, 12:31 PM
#6
lat9 avatar

lat9

Administrator

Join Date:
Sep 2009
Location:
Stuart, FL
Posts:
14,137
Plugin Contributions:
56

Re: Winmerge - is there a way to have only the text highlighted that is different?

dbltoe:

If you follow the method at https://www.zen-cart.com/entry.php?3-How-do-I-rebuild-my-site-on-the-new-version-instead-of-upgrading, there's really not much of a need for winmerge.
That depends on the changes a store might have made to core-files and the extent to which the store's active template makes use of obsoleted interfaces (like the change to the product's URL display).