Would it be possible to have the whole changes as an changeset on Gerrit? This would make review and comments much easier than having to do this on this list.

On Tue, Sep 25, 2012 at 7:14 PM, IAlex <ialex.wiki(a)gmail.com> wrote: is https://gerrit.wikimedia.org/r/#/q/status:merged+project:mediawiki/core+bra… sufficient? (copied from the first message on this thread) -Jeremy _______________________________________________ Wikitech-l mailing list Wikitech-l(a)lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l

Yes and no. The person that merges the branch can create a merge commit and submit that for review (git checkout -b mergewikidata master && git merge wikidata && git review) but Gerrit will not show the diff properly: it'll either show just the conflict resolutions, or nothing at all. You can view the full diff by fetching the commit on your localhost and using standard git tools (e.g. git review -d 12345 && git show), but you won't be able to use inline comments quite as nicely.

Hi, I have tried to create one changeset with the whole content handler for your convenience: <https://gerrit.wikimedia.org/r/#/c/25736/> Note that is based on 7ccc77a and needs to get rebased before merge, but the major parts should be there. Since I am not a Git expert, I may have mad it all completely wrong. I tried squashing, but that didn't work, so I created a diff and patched master with it and then submitted that as a changeset to Gerrit... I think some whitespace issue creeped in through that. So, as said, I don't have a clue how useful or correct this changeset is, but I hope it is somehow helping in understanding the change. The actual change to be merged continues to be in the Wikidata branch. Cheers, Denny 2012/9/27 Rob Lanphier &lt;robla(a)wikimedia.org&gt;rg>: wrote: and merge it'll view standard to -- Project director Wikidata Wikimedia Deutschland e.V. | Obentrautstr. 72 | 10963 Berlin Tel. +49-30-219 158 26-0 | http://wikimedia.de Wikimedia Deutschland - Gesellschaft zur Förderung Freien Wissens e.V. Eingetragen im Vereinsregister des Amtsgerichts Berlin-Charlottenburg unter der Nummer 23855 B. Als gemeinnützig anerkannt durch das Finanzamt für Körperschaften I Berlin, Steuernummer 27/681/51985. _______________________________________________ Wikitech-l mailing list Wikitech-l(a)lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l

Hi everyone, We now at around the time that we planned to merge the ContentHandler branch in. Questions: * Daniel/others: have you submitted a merge commit for this? If not, do you need help/clarification, or do you have it? * People who reviewed Denny's faux commit[1] and left comments. Any blockers, or mainly stylistic stuff? Everyone else, now is the last call before the merge. Rob [1] Faux commit of ContentHandler branch: <https://gerrit.wikimedia.org/r/#/c/25736/> _______________________________________________ Wikitech-l mailing list Wikitech-l(a)lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l