same method, but with UltraCompare works for me. i use the 'Merge' feature a lot, so as to not have to even copy/paste or dice/splice.

also, i try to comment blocks of code where i have a mod with '// SD - Mod: xxxx' in php and {* SD - Mod: xxxx *} in the tpls.

then a simple grep piped to a txt file, where i use a macro to transform it to a csv for excel to be used as a checklist. (this is extra, but i'm a little anal so what the hell)

I totally vouch for the commenting mod's approach; you never know when you'll be poking around and go "what the hell is this?"

We could standardize comment structure to whatever php.net/zend recommends

makes sense Allen

What would that be?

I just do

//HACK - name

//END OF HACK - name

But i can never find them lol....

I tried beyond comapare from 7.1x to 7.2 and it didnt work so well for me, i dont know why?

So returned to 7.2 default and added the hacks again
as i'm getting more confident now

Works a treat, will do bug fix updates with beyond compare
and try again when 7.3 hits the shelf

You really have to pay attention with Beyond Compare that you don't over-write lines with partial changes for mods. Typical example is when we add a column to a database table for a mod then add that column to our query by tagging it on the end. Beyond Compare will show it's different from the unchanged files, but unless you scroll all the way to the right to see what the change is you're going to over-write the change if you just copy over it. Upgrading is do-able with BC, it just takes a while...

New upgrade, new method

2 times beyondcompare open.

One with original 7.2 with my 7.2 to find all the hacks
One with my 7.2 and a fresh new 7.2.2 to apply the hacks back again.

Been there several times; I find it a nice way to update with hacks quickly... Then again, I like installing everything manually sometimes... call it OC