How to merge new default templates with custom templates

[user2616 +]

What version of 68 Classifieds are you running?
V4.1.8 Developer

What template are you using?
default (custom)

Please describe in detail the issue you are having:

I started my version with v4.1.6
Created template/custom
Copied selected templates and CSS files from template/default to template/custom
Custom templates include layout.tpl and showlistings2.tpl
Upgraded from v4.1.6 to v4.1.8
I noticed that change log for v4.1.7 includes layout.tpl and showlistings2.tpl
Now, how to merge the changes from default v4.1.7 layout.tpl and showlistings2.tpl to my custom layout.tpl and showlistings2.tpl?

Thank you for any advise.

[seymourjames +]

Well if you have documented your changes to your template files then this should be easy. Just make the same modifications to the new layout and showlistings files. Then put these in your custom template folder. I doubt you will need to do anything more. Alternatively look at the differences between your template files and the newly provided ones using an online differencing system. You may find it only to be a couple of lines to add into yours or take away. I do not remember much changing between 4.1.6 and 4.1.8 in terms of the template files.

[user2616 +]

Thanks seymourjames.

I am not sure how to find the difference between my template files and the newly provided ones using an online differencing system.

Could you please give me a hint on how to use an online differencing system.

Thanks is advance.

[Chaslie +]

Here is a piece of software you can download, install on your PC and make comparisons between files: Compare It! 4.0 -- file compare and merge tool helps in file comparison

[user2616 +]

Thanks Chaslie for your quick response.

I went to download.cnet.com to download Compare It! 4.0.
The product specs say (30-day trial); $29.00 to buy.
At the moment, I am hesitant to buy this product.
Meanwhile, I searched for "Compare Two Text Files Software" By license type: Free.
Files Compare Tool 2.7 appeared on top of the list with Price: Free.
I downloaded this software, installed and run.
Wow, what a magic, after I selected 2 files, layout.tpl V4.1.6 and layout.tpl V4.1.8, the software displayed both the file contents side by side with colour coded text that is changed.
Then I edited my custom file, layout.tpl, to incorporate the changes.
Tested and the V4.1.8 works fine.

Thanks a lot for your help, you guys are great!

[Lhotch +]

kdiff3 is another good free file compare utility.

KDiff3 - Homepage

[seymourjames +]

and this one is online. I often use it.

File Difference Tool. Show file differences between two files.

[user2616 +]

Thanks for the suggestion.

Tried online File Difference Tool. Works very fine.

Looked at the Kdiff3 site. I try next time when I upgrade.