Last modified: 2013-08-22 14:55:06 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T43298, the corresponding Phabricator task for complete and up-to-date bug report information.
First Last Prev Next    This bug is not in your last search results.
Bug 41298 - Wikidata merge mistakes
Wikidata merge mistakes
Status: VERIFIED FIXED
Product: MediaWiki
Classification: Unclassified
ContentHandler (Other open bugs)
unspecified
All All
: High normal (vote)
: ---
Assigned To: Wikidata bugs
: code-update-regression
Depends on: 41267 41300
Blocks:
  Show dependency tree / graph
 
Reported: 2012-10-23 09:16 UTC by Derk-Jan Hartman
Modified: 2013-08-22 14:55 UTC (History)
6 users (show)

See Also:
Web browser: ---
Mobile Platform: ---
Assignee Huggle Beta Tester: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Derk-Jan Hartman 2012-10-23 09:16:39 UTC 
It seems there were a few merge mistakes in wikidata, particularly in commit bb51a58e575b13eb8b6c496482f7066a7081f676 it seems.


I see at least the following were accidentally (partly) reverted for EditPage in master
43b44d84e5d597aed3d749293db891cf02974701

dc8f3e6c78eeade71fd6409fc7bd7771d55414ee

4d4bfc27a1bedf6b0d1670707ac812fe36fe85ad (already fixed)

20291cd16612c6f84f21fd90a3af6526bf64d752

These were then merged from the wikidata branch back into master again it seems. I suggest that entire master->wikidata merge is double checked.
Comment 1 Andre Klapper 2012-10-23 15:49:01 UTC 
CC/ing Daniel as he merged.
Comment 2 Daniel Kinzler 2012-10-24 13:15:22 UTC 
Ugh, this is not good. I wonder how this happened.

I'm off duty until next week, but I'll try to look into it anyway. Hopefully I'll find out more about when and how this happened.
Comment 3 Daniel Kinzler 2012-10-24 14:42:49 UTC 
Fixes:

* Change I5449d033: (Bug 41298) partial fix: re-applying Id7b331e1b
* Change I75ddf1d9: (Bug 41298) partial fix: re-apply I9441a277
* Change I2628d73a: (Bug 41298) partial fix: re-apply Id4d5504a

It's interesting to note that as far as I can see, only changes to EditPage where lost while changes to other files from the same commit were preserved. Looks like somewhere, someone (probably me) used an old version of EditPage.
Comment 4 Sumana Harihareswara 2012-10-24 20:43:43 UTC 
Aude: since these fixes have been merged, can we close this ticket?
Comment 5 Daniel Kinzler 2012-10-25 09:07:04 UTC 
(In reply to comment #4)
> Aude: since these fixes have been merged, can we close this ticket?

Well, as far as I can see, I fixed all the problems the OP mentioned explicitly. But the OP called for a ful lre-evaluation of the merge (or at least of EditPage), which I didn't do.

So, basically, I'd ask the OP whether this is good enough.
Comment 6 Derk-Jan Hartman 2012-10-25 12:18:22 UTC 
There were not all merged yet. They are now.
Comment 7 Derk-Jan Hartman 2012-10-25 12:19:43 UTC 
I trust Daniel if he says that as far as he could tell it only affected EditPage. The suggested cause also seems logical.
Comment 8 Aude 2012-10-26 04:36:51 UTC 
I have looked through the merge cleanup commit to check EditPage and other files changed there. Agree that it looks like just EditPage was affected and only for stuff committed in mid/late Sept and early October. I think we got everything fixed.
Comment 9 denny vrandecic 2013-08-22 14:55:06 UTC 
Closed older resolved bugs as verified.
Note You need to log in before you can comment on or make changes to this bug.
First Last Prev Next    This bug is not in your last search results.

Navigation
Links