I would like to make a fairly major change to a publicly-available project tracked by Subversion, but I do not have commit privileges on the public repository. I do, however, have my own Subversion repository so I would like to store my version of the project there. The important functionality I want to retain is the ability to merge changes to the public trunk to the "branch" stored on my repository. What is the best way to do this? If possible, I would like to do this with the TortoiseSVN client.
I have tried to "Merge a range of revisions" in TortoiseSVN while leaving the revision range blank, but this generates conflicts even on files that I have not changed (but have been changed in the public trunk).