Hi everyone,
We plan to rebranch 1.18 from trunk soon (as in, almost immediately). What we've found is that many things in the current branch are harder to get working than they should be, and that trunk seems to be in better shape (in particular, all tests are passing now). That will mean taking on more code review, but it's work we'll have to do one day or another. Apologies to hashar for not making this decision sooner, since he spent a good chunk of the weekend trying to get unit tests fully operational in the 1.18 branch (but thank you for making the effort!)
That's not to say that everything that has been checked into trunk over the past couple of months is automatically going to be a feature of 1.18. Anything that's too complicated or risky that's been checked in will be backed out of the branch and saved for 1.19.
Chad Horohoe (^demon on IRC) is going to be the one rebranching.
Let us know if you have any questions.
Thanks! Rob
On Mon, Jul 18, 2011 at 9:29 PM, Rob Lanphier robla@wikimedia.org wrote:
Chad Horohoe (^demon on IRC) is going to be the one rebranching.
Rebranching is now done, see https://secure.wikimedia.org/wikipedia/mediawiki/wiki/Special:Code/MediaWiki... and friends. I'm about to take a few things out.
Roan
On Mon, Jul 18, 2011 at 2:40 PM, Roan Kattouw roan.kattouw@gmail.com wrote:
On Mon, Jul 18, 2011 at 9:29 PM, Rob Lanphier robla@wikimedia.org wrote:
Chad Horohoe (^demon on IRC) is going to be the one rebranching.
Rebranching is now done, see https://secure.wikimedia.org/wikipedia/mediawiki/wiki/Special:Code/MediaWiki... and friends. I'm about to take a few things out.
Like Roan says, this is now done. I moved the old REL1_18 to "TheBranchFormerlyKnownAsREL1_18" to preserve history and to keep for reference. Created a new REL1_18 from trunk as of r92473.
I've already said this before and I'm going to say it again....Please do not take this as an invitation to begin breaking trunk with huge refactorings. It makes backporting fixes a major PITA and pushes the 1.18 release back even further. Corporal punishment may be doled out if you cannot follow this simple instruction <3
Please let me know if you have any questions.
On Mon, Jul 18, 2011 at 2:58 PM, Chad innocentkiller@gmail.com wrote:
I've already said this before and I'm going to say it again....Please do not take this as an invitation to begin breaking trunk with huge refactorings. It makes backporting fixes a major PITA and pushes the 1.18 release back even further. Corporal punishment may be doled out if you cannot follow this simple instruction <3
CORPORAL PUNISHMENT REPORTING FOR DUTY! WHO WANTS TO GET REEEEEEE-VERTED?! :)
-- brion
Rob Lanphier wrote:
Hi everyone,
We plan to rebranch 1.18 from trunk soon
Yes, please!
It was branched when nobody was really able to pay attention to it or to trunk (due to 1.17 taking longer).
Re-branching sounds like the best thing to do right now. Unit testing isn't half done now either but actually working.
– Krinkle
On 18/07/11 21:29, Rob Lanphier wrote:
Hi everyone,
We plan to rebranch 1.18 from trunk soon (as in, almost immediately).
Great move! I have spend a good part of my Sunday trying to fix the blocking system and eventually gave up. Restarting from a fresh and stable branch is probably better :-)
<snip>
Apologies to hashar for not making this decision sooner, since he spent a good chunk of the weekend trying to get unit tests fully operational in the 1.18 branch (but thank you for making the effort!)
Your welcome, I was just merging revisions & their followups anyway. Guess I will shift to code reviewing the new revisions :-)
That's not to say that everything that has been checked into trunk over the past couple of months is automatically going to be a feature of 1.18. Anything that's too complicated or risky that's been checked in will be backed out of the branch and saved for 1.19.
We might want to establish a list of features we have added since 1.17. Maybe we could appends the list to: http://www.mediawiki.org/wiki/MediaWiki_1.18
wikitech-l@lists.wikimedia.org