Anonymous - 2008-10-05

Wes
I've only just seen this proposal of yours. A good one too.

In the absence of it though, I thought I'd share what I do. Its simple, and works well if you upgrade using Tortoise SVN as the changes to standard files is minimal enough to be auto-merged.

What I do is very simple:
1 - I created a new folder called 'modfiles' in the PGV root folder. I place all my re-written or modified files in here, with the same name as their original.

2 - in each original file I add two lines of code:

A - at the very top, before anything is processed, something like:
if (!file_exists("modfiles/family.php")){

B - at the very bottom :
} else {include ('modfiles/family.php');}

When I do an svn update, TortoiseSVN generally regards as insignificant differences, so just merges any changes. Very rarely it will give a "conflicted file" warning, which I can easily rectify.
I then just need to use WinMerge to compare my modified file with the new one from svn to see what changes I need to carry across to my own file - usually a very simple process.