The primary reason for using WinMerge to compare Live and New Fileset in this step is to easily identify the changes & customizations in Live and then use them to edit New Fileset in order to carry those changes over in the upgrade, thus keeping my settings, designs, customizations, etc?
Winmerge filter mod#
The primary reason for using WinMerge to compare Live with Fileset in step 1 was to identify which files I have changed through customization and Mod addons so I would know what files in New Fileset to edit later?
In order to better understand why I'm using WinMerge twice over three sets of ZC files, can you tell me if I'm understanding correctly based on the statements below? do nothing in terms of file editing in New Fileset?ĥ. Regarding files returned as "right side only" (Live) - if these are indeed new files added by Mods, I shouldn't need to do anything with them, correct? Wouldn't they be handled the same way override files not appearing on the changelog list are handled? i.e.
Winmerge filter code#
Because the files returned as "text files are different" are comprised of both override and non-override files, I have two questions:Ī) Of those that are core code customizations, am I correct that each of their New Fileset counterparts must be edited with the changes that were made to them?ī) Of those that are part of the override system (found in MY CUSTOM TEMPLATE), I can leave those alone unless they appear on the list of changed files in the 139h changelog?Ĥ. And so in order to more easily identify my changed files so I can edit their New Fileset counterparts, I should make a list of all files returned with a comparison result of "text files are different"?ģ. Am I correct in thinking that when I run this comparison, that pretty much all of the files will be different?Ģ. I know my next step, according to the tutorial, is to run WinMerge to compare 138a Live with the 139h fileset, (I'll refer to them as Live and New Fileset, respectively), and make the appropriate file edits.ġ. invoice customization, email customization, etc - all common core code customizations - nothing fancy or outrageous). (The vast majority of these are in MY CUSTOM TEMPLATE, but a handful are core code files (i.e.
Winmerge filter mods#
Does "text files are different" mean that the file exists in both Live and the Fileset, but that it has been altered by Mods and/or my customizations & design changes? Does the "right side only", (Live) mean that these are new files that were not in the original fileset because they were created when mods were installed?Ģ. Only two of them have a result of "left side only" (Fileset) and these are the two config files named "dist-config" that came with the fileset and were moved and renamed to "config" upon installation.ġ.
Of these remaining files, about 3/4 of them have a comparison result of "right side only" (Live) and about a quarter of them have a comparison result of "text files are different". This action brought me down to a less daunting, but still hefty 305 files. My next step was to hide all image files by highlighting them, right clicking, and selecting "hide items". This action returned just under 800 compared files. So I ran it again after turning off "compare white space", "compare blank lines", and "compare carriage return differences". I'll refer to them as Fileset and Live, respectively, throughout this post.Īs stated in my initial post, the first comparison returned almost 1800 files after turning off "view identical" in the view menu and applying a filter for comments. I'm using WinMerge 2.12.4 to compare the 138a fileset with the 138a files from my live store.
Here's where I'm at and what I've done so far:
Winmerge filter upgrade#
My questions this time around are about file comparison & merging as part of the upgrade process, however I'm posting them here because the questions are also about correctly interpreting what I see in WinMerge in order to carry out that process.