Thread:User talk:Siebrand/MediaWiki r87510 - Code Review/reply

You *can* commit to trunk/extensions, but you cannot commit in other folders in trunk/ (for example phase3). New code should be added to trunk/... first, and only then be branched. If that does not happen, no history is retained for the files you have added.

I propose that you rename the extension in the 1_16 branch to an extension in trunk, and then branch it (in both 1_16 and 1_17 if you like). From then on, you should continue developing it in trunk, and backport (MFT - merge from trunk) whatever needs backporting. If you have a branch-specific fix, that should of course be applied to one or more branches only.

More clear?