This patch was made using subversion. The svn at sourceforge appears to be out of date according to the latest beta. (as can be seen from the extra stuff that was patched).
What I did was take my modifications from the beta and copy them over the clean svn checkout. Then created my patch and submitted it.
Would it be possible to update the repository with your latest changes? (Use the same method as above, ie do a fresh checkout, then copy *.* overtop). After that it should be a piece of cake to keep yourself and any other developer in sync.