We use WordPress for development, but often make a lot of modifications. We’re looking for a way to always keep our development version up to date with our modified version.
It possible to import all of the WordPress SVN commits, branches and tags, but merge these with any we’ve made in our repo.
For example if we had removed the readme.txt file in our local repo, when we did another import from the WordPress SVN it would display the changes between this files and allow us to decide to to merge, update etc.
If not SVN is this possible with Git?
Thanks,
What you want is a vendor branch. We used it with wordpress and it works well.
Subversion svn:externals file override?
I think you can merge from the WordPress SVN repo into your local repo, but you need to keep track of what revisions you have merged, and you need to remind yourself to do the merge.
There is no concept of live forking in SVN. The closest you can get is SVN Externals, but that does not allow you to check in local modifications.