I think that the best way to deal with this is to have your stuff in a different branch in Git. Now when you want to upgrade you can always update the branch tracking gerrit's master branch, and then try to merge (or rebase) your branch with this.

Now comes the tricky part, you will face a series of merge conflicts which you have to fix. If that's done its working again!

On Tue, Mar 12, 2013 at 7:03 PM, Yury Katkov katkov.juriy@gmail.com wrote:

Hi guys!

We have about 30 extensions in our platform and we really try hard not to modify MediaWiki and the extensions that weren't made by us. Unfortunately sometimes we have to modify them and even more regretfully we don't send the patches to vendors immediately. The result is obvious and sad - the vendors continue to develop their extensions and at one inevitable moment we have to deal with upgrading and merging. :-(

We're using git to store all the code and it doesn't allow the nested .git directories to be presented in the same project.

How do you deal with that? Do you use git submodules, separate repositories for the patched extensions or some fancy policy and documentation?

---

Yury Katkov, WikiVote

---

Mediawiki-enterprise mailing list Mediawiki-enterprise@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-enterprise