Hi, Interesting issue and probably not one correct answer.
I'd go with generating patches against the latest SVN head as they can be easily applied. I'd try and keep in sync with the trunk (ie svn update) but no need to revert to it as that would mean more work for you. Thanks, Justin
