How to edit and update PHP script like Wordpress?

Question

I would like to ask if there is a software that could help me in mantaining and managing my Wordpress+Plugin modified version.

The problem is that I have a certain number of hacks made to the core and to some plugins I am using, and at every update of a plugin or the core I have to remember to save my hacks and merge with the new source.

I am using Notepad++ and WinMerge for these tasks.

Do you know a software or do you have any suggestions that could help me in improve my manual workflow process.

Thank you in advance, for the help

Answer 1

You need to start using version control such as Subversion / Git (i.e. TortoiseSVN client) for windows.

You can then maintain your code as a "branch" and keep the wordpress updates in the trunk, when you want to release you "merge" the branch into the trunk and then "tag" the release.

There will be a learning curve involved in this, however I do recommend version control going forward, as it's easy to forget those changes you made xMonths ago, but not with version control when you can historically jump back in time to that revision you made and see exactly what you did.