"Hashar" changed the status of MediaWiki.r112702 to "fixme" and commented it.
URL: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/112702#c31664
Old Status: ok
New Status: fixme
Commit summary for MediaWiki.r112702:
[ApiSandbox] Prevent duplicate submission of the form when clicking "Make
Request"
* The buttons had type=submit and were inside the <form> tree, when not
prevented the form is naturally submitted in a non-ajax fashion (which is then
hooked into from the submit handler)
* Fixes:
-- (bug 34790) [Regression] Pressing "Make Request" shouldn't make two requests
to api.php
Hashar's comment:
Somehow this commit is replacing the text which cause some kind of tree
conflict when attempting to merge the commit to a different branch. Yeah
branching is fun with svn.
Shell session below:
Attempting to merge one file does not do anything:
<pre>
hashar/srv$ svn merge -c 112702
/srv/{trunk,1.19wmf1}/extensions/ApiSandbox/ext.apiSandbox.js
hashar/srv$
</pre>
Directory merge cause a tree conflict:
<pre>
hashar/srv$ svn merge -c 112702 /srv/{trunk,1.19wmf1}/extensions/ApiSandbox
--- Merging r112702 into '/srv/1.19wmf1/extensions/ApiSandbox':
C /srv/1.19wmf1/extensions/ApiSandbox/ext.apiSandbox.js
R /srv/1.19wmf1/extensions/ApiSandbox/ext.apiSandbox.css
Summary of conflicts:
Tree conflicts: 1
</pre>
Help! :-)
<pre>
hashar/srv$ svn status /srv/1.19wmf1/extensions/ApiSandbox/
M /srv/1.19wmf1/extensions/ApiSandbox
C /srv/1.19wmf1/extensions/ApiSandbox/ext.apiSandbox.js
> local edit, incoming delete upon merge
R + /srv/1.19wmf1/extensions/ApiSandbox/ext.apiSandbox.css
</pre>
This is mostly for history purpose. Talked about that issue with Reedy and
Krinkle on IRC.
_______________________________________________
MediaWiki-CodeReview mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-codereview
