Zen Cart Logo
Forums / Upgrading from 1.3.x to 1.3.9 / When using Winmerge it appears every file shows up as different

When using Winmerge it appears every file shows up as different

Views: 28,200

Results 1 to 17 of 17
8 Jun 2010, 1:46 AM
#1
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

When using Winmerge it appears every file shows up as different

I run winmerge and instead of a few files coming back as different it appears as if every file comes back. A total of 2162. I read the sticky thread but when I go to the Tools | Filers | Linefilters section I do not see any option to input any sort of code as detailed in the thread. How can I get this only give me the important changed files?

8 Jun 2010, 4:45 AM
#2
kobra avatar

kobra

Black Belt

Join Date:
Aug 2005
Location:
Arizona
Posts:
31,500
Plugin Contributions:
4

Re: When using Winmerge it appears every file shows up as different

If upgrading, then ALL the CORE files should be replaced
Then the only files you need to compare/edit are those that you have in your template override locations

8 Jun 2010, 5:44 PM
#3
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

kobra:

If upgrading, then ALL the CORE files should be replaced
Then the only files you need to compare/edit are those that you have in your template override locations

See, that's all greek to me. What do I do to get it to compare/edit those that I have in my template override locations?

8 Jun 2010, 5:45 PM
#4
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

I'd also like to add that I haven't done anything special to the store other than change some visual aspects like background color, banner etc. No special add on's or modifications at all.

8 Jun 2010, 6:33 PM
#5
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

Help would be greatly appreciated. I'm really hung up here, I've been hacked and I need to update quickly and I'm stuck.

8 Jun 2010, 8:50 PM
#6
merlinpa1969 avatar

merlinpa1969

Totally Zenned

Join Date:
Mar 2004
Posts:
13,031
Plugin Contributions:
4

Re: When using Winmerge it appears every file shows up as different

A better solution is to use a threeway merge,

the Original stock version in the left pane your version in the cetner pane and the new version in the right pane....

this way you have a list of the files that YOU changed originally

then you only have to work on merging those files into the 1.3.9 series

8 Jun 2010, 8:58 PM
#7
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

See I basically need someone to give me a step by step here that's a little more in depth. Especially more in depth than the 3 "easy" steps to upgrade.

8 Jun 2010, 9:06 PM
#8
merlinpa1969 avatar

merlinpa1969

Totally Zenned

Join Date:
Mar 2004
Posts:
13,031
Plugin Contributions:
4

Re: When using Winmerge it appears every file shows up as different

the first think you need ot deermin is what files you changed originally

thats why you do a winmerge on a coreset of files from your original install

this will give you the list of files that you have changed

Now you can compare that with a fresh 1.3.9 install and you will now have a short list of files that need to be compared and merged

8 Jun 2010, 9:18 PM
#9
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

Thank you for the help. But step by step in Winmerge what do I need to do? I need a guide. I know next to nothing about the program so I need clear instructions. ie Open this file, pull down edit menu and select _____, etc.

8 Jun 2010, 9:20 PM
#10
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

For instance I have no idea how you would get three panels up in this thing. If that's actually possible I don't know how you would do it.

8 Jun 2010, 9:23 PM
#11
1234go avatar

1234go

New Zenner

Join Date:
May 2010
Posts:
34
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

I don't know how or why it's different now but running winmerge on the two files I now get 19 items including 12 folders with probably a hundred or so items inside each and 7 files like index.php, install.txt, ipn_main_handler.php etc etc that round out the main list. What do I do with that?

:frusty:

8 Jun 2010, 9:52 PM
#12
merlinpa1969 avatar

merlinpa1969

Totally Zenned

Join Date:
Mar 2004
Posts:
13,031
Plugin Contributions:
4

Re: When using Winmerge it appears every file shows up as different

Hire someone to do the upgrade,
it will actually cost you more in lost time then it will for an upgrade

16 Nov 2010, 11:40 PM
#13
danilyn22 avatar

danilyn22

Zen Follower

Join Date:
Dec 2008
Location:
California
Posts:
102
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

I am experiencing the same thing.

When using Winmerge I have it eliminating identical file but there are a whole bunch of files that are showing up as different when they are not. They appear to be core files that I have never touched but I can't feel comfortable with that.

Fortunately I was pretty good about using the override but would like to know why identical files are showing up as different.

I get to this part of the upgrade file and get all crazy because I have a whole lot of identical files to look at. What do I do?

7 Jan 2011, 11:05 AM
#14
oksoda avatar

oksoda

New Zenner

Join Date:
May 2009
Posts:
17
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

I tried this exact same approach, using winmerge to compare the stock 1.3.8a to my modified one. 790 files are different, there's no way in the world I altered that many files. What am I doing wrong?

7 Jan 2011, 9:10 PM
#15
disciple avatar

disciple

Totally Zenned

Join Date:
Aug 2004
Posts:
278
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

It is most likely a spacing issue.

I experienced the same thing and when I went to look at the files the difference was in the spacing/tabs for the code.

Rick

8 Jan 2011, 3:53 AM
#16
oksoda avatar

oksoda

New Zenner

Join Date:
May 2009
Posts:
17
Plugin Contributions:
0

Re: When using Winmerge it appears every file shows up as different

disciple:

It is most likely a spacing issue.

I experienced the same thing and when I went to look at the files the difference was in the spacing/tabs for the code.

Rick

That makes sense. I suppose there's no way I can come up with a way to filter that out in winmerge.