Page MenuHomePhabricator

MediaWiki-MergeHistoryComponent
ActivePublic

Members (1)

Watchers (1)

Details

Description

The "Merge history" functionality of MediaWiki core. Includes the MergeHistory class and the frontend SpecialMergeHistory ApiMergeHistory. (Documentation)

Parent: MediaWiki-General

Recent Activity

Yesterday

Pppery updated the task description for T382958: History merge should support timestamps on both ends.
Fri, Jan 3, 5:37 PM · MediaWiki-MergeHistory
Pppery created T382958: History merge should support timestamps on both ends.
Fri, Jan 3, 5:37 PM · MediaWiki-MergeHistory

Tue, Dec 31

Aklapper raised the priority of T118132: Merging pages should add a log entry to the destination page from Medium to Needs Triage.
Tue, Dec 31, 6:43 PM · MediaWiki-MergeHistory, MediaWiki-Logevents

Sun, Dec 29

Tamzin added a comment to T118132: Merging pages should add a log entry to the destination page.

@JJPMaster Well, consensus to request implementing this change. enwiki has no jurisdiction to compel any change to MediaWiki, and it's a bit irresponsible that the RfC implied it could. (That's on the nominator, not on you as closer, although I'd suggest a word other than "adopt" in the close for maximum clarity.) But as @Novem_Linguae said in the discussion, this should definitely be taken as a data point in favor of this change, and a pretty strong one at that.

Sun, Dec 29, 5:45 PM · MediaWiki-MergeHistory, MediaWiki-Logevents
JJPMaster triaged T118132: Merging pages should add a log entry to the destination page as Medium priority.

Note: https://en.wikipedia.org/wiki/Wikipedia:Village_pump_(proposals)#RfC:_Log_the_use_of_the_HistMerge_tool_at_both_the_merge__target_and_merge_source has been closed with consensus to implement this change.

Sun, Dec 29, 4:43 PM · MediaWiki-MergeHistory, MediaWiki-Logevents
Pppery closed T341760: Special:MergeHistory should place a null edit in the page's history describing the merge as Declined.

https://en.wikipedia.org/wiki/Wikipedia:Village_pump_(proposals)#RfC:_Log_the_use_of_the_HistMerge_tool_at_both_the_merge__target_and_merge_source

Sun, Dec 29, 4:40 PM · MediaWiki-MergeHistory

Mon, Dec 9

Pppery edited projects for T23312: Request for feature: RevisionMove, added: MediaWiki-MergeHistory; removed MediaWiki-extension-requests.
Mon, Dec 9, 6:00 AM · MediaWiki-MergeHistory

Nov 21 2024

Novem_Linguae added a comment to T341760: Special:MergeHistory should place a null edit in the page's history describing the merge.

A log entry at the _target was separately requested in T118132: Merging pages should add a log entry to the destination page. I personally don't see the point of any of these requests, though - history merging should if done properly be seamless and not need an annotation.

Nov 21 2024, 11:22 PM · MediaWiki-MergeHistory

Nov 20 2024

Pppery removed a project from T23824: Special:MergeHistory does not merge file history: Commons.
Nov 20 2024, 6:12 PM · MediaWiki-File-management, MediaWiki-MergeHistory

Oct 3 2024

matmarex merged task T76293: Special:MergeHistory does not refresh link tables after a merge into T275947: Make MergeHistory insert and delete links properly.
Oct 3 2024, 4:39 PM · MediaWiki-MergeHistory
matmarex merged T76293: Special:MergeHistory does not refresh link tables after a merge into T275947: Make MergeHistory insert and delete links properly.
Oct 3 2024, 4:39 PM · MW-1.40-notes (1.40.0-wmf.24; 2023-02-20), MediaWiki-MergeHistory

May 12 2024

Maintenance_bot added a project to T23824: Special:MergeHistory does not merge file history: Commons.
May 12 2024, 4:31 PM · MediaWiki-File-management, MediaWiki-MergeHistory
Pppery added a project to T23824: Special:MergeHistory does not merge file history: MediaWiki-File-management.
May 12 2024, 4:11 PM · MediaWiki-File-management, MediaWiki-MergeHistory

Jan 6 2024

ReleaseTaggerBot added a project to T183501: MergeHistory: timestamp-based midpoints are not sufficient: MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ).
Jan 6 2024, 1:00 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
Maintenance_bot removed a project from T183501: MergeHistory: timestamp-based midpoints are not sufficient: Patch-For-Review.
Jan 6 2024, 12:30 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
Pppery closed T183501: MergeHistory: timestamp-based midpoints are not sufficient as Resolved.
Jan 6 2024, 12:05 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory

Jan 5 2024

gerritbot added a comment to T183501: MergeHistory: timestamp-based midpoints are not sufficient.

Change 967541 merged by jenkins-bot:

[mediawiki/core@master] Allow MergeHistory to split up joined revisions with same timestamp

https://gerrit.wikimedia.org/r/967541

Jan 5 2024, 11:33 PM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory

Nov 28 2023

Pppery closed T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to as Resolved.
Nov 28 2023, 11:19 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
Maintenance_bot removed a project from T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to: Patch-For-Review.
Nov 28 2023, 11:10 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
ReleaseTaggerBot added a project to T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to: MW-1.42-notes (1.42.0-wmf.9; 2023-12-12).
Nov 28 2023, 11:00 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
gerritbot added a comment to T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to.

Change 975391 merged by jenkins-bot:

[mediawiki/core@master] Fix testSourceUpdateWithRedirectSupport

https://gerrit.wikimedia.org/r/975391

Nov 28 2023, 10:59 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests

Nov 18 2023

gerritbot added a project to T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to: Patch-For-Review.
Nov 18 2023, 3:40 AM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
gerritbot added a comment to T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to.

Change 975391 had a related patch set uploaded (by Pppery; author: Pppery):

[mediawiki/core@master] Fix testSourceUpdateWithRedirectSupport

https://gerrit.wikimedia.org/r/975391

Nov 18 2023, 3:40 AM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
Pppery claimed T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to.
Nov 18 2023, 3:35 AM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests

Nov 6 2023

Ammarpad added a comment to T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to.

doesn't test what it is supposed to

So what should it test for and what is it testing now?

Nov 6 2023, 3:43 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests

Nov 3 2023

Novem_Linguae added a comment to T76557: Special:MergeHistory causes incorrect byte change values in history.

Changed my mind. This happened to me with undelete today too. This is best handled as part of the other ticket.

Nov 3 2023, 8:43 AM · MediaWiki-MergeHistory
Novem_Linguae merged task T76557: Special:MergeHistory causes incorrect byte change values in history into T38976: Diffs: Incorrect number of bytes added or removed because rev_parent_id is set to wrong revision.
Nov 3 2023, 8:43 AM · MediaWiki-MergeHistory

Oct 21 2023

Pppery created T349431: MergeHistoryTest testSourceUpdateWithRedirectSupport doesn't test what it is supposed to.
Oct 21 2023, 5:40 PM · MW-1.42-notes (1.42.0-wmf.9; 2023-12-12), MediaWiki-MergeHistory, MediaWiki-Core-Tests
Pppery removed projects from T118132: Merging pages should add a log entry to the destination page: MediaWiki-Page-history, MediaWiki-Page-diffs.
Oct 21 2023, 4:55 AM · MediaWiki-MergeHistory, MediaWiki-Logevents
Graham87 added a comment to T341760: Special:MergeHistory should place a null edit in the page's history describing the merge.

I do history-merging on enwiki (though not as often as previously) and the main reason I don't use Special:MergeHistory (except in unusual cases) is the lack of annotation. I think it should be annotated like any other edit/admin action that affects a page (yes when done cleanly the history should still seem natural, but sometimes history merges hard/impossible to do cleanly).

Oct 21 2023, 4:53 AM · MediaWiki-MergeHistory
Pppery claimed T183501: MergeHistory: timestamp-based midpoints are not sufficient.
Oct 21 2023, 1:38 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
gerritbot added a project to T183501: MergeHistory: timestamp-based midpoints are not sufficient: Patch-For-Review.
Oct 21 2023, 1:38 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
gerritbot added a comment to T183501: MergeHistory: timestamp-based midpoints are not sufficient.

Change 967541 had a related patch set uploaded (by Pppery; author: Pppery):

[mediawiki/core@master] Allow MergeHistory to split up joined revisions with same timestamp

https://gerrit.wikimedia.org/r/967541

Oct 21 2023, 1:38 AM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
Novem_Linguae added a parent task for T76557: Special:MergeHistory causes incorrect byte change values in history: T38976: Diffs: Incorrect number of bytes added or removed because rev_parent_id is set to wrong revision.
Oct 21 2023, 12:06 AM · MediaWiki-MergeHistory
Novem_Linguae reopened T76557: Special:MergeHistory causes incorrect byte change values in history as "Open".

It seems like T38976: Diffs: Incorrect number of bytes added or removed because rev_parent_id is set to wrong revision might have multiple causes such as Special:Import, Special:MergeHistory, etc.

Oct 21 2023, 12:05 AM · MediaWiki-MergeHistory

Oct 20 2023

Pppery merged task T76557: Special:MergeHistory causes incorrect byte change values in history into T38976: Diffs: Incorrect number of bytes added or removed because rev_parent_id is set to wrong revision.
Oct 20 2023, 11:57 PM · MediaWiki-MergeHistory
Pppery changed the status of T70096: Allow history merge without a redirect from Stalled to Open.
Oct 20 2023, 11:56 PM · MediaWiki-MergeHistory, Platform Engineering, User-DannyS712
Pppery updated the task description for T70096: Allow history merge without a redirect.
Oct 20 2023, 11:55 PM · MediaWiki-MergeHistory, Platform Engineering, User-DannyS712
Pppery merged T213625: Add option to leave redirect in Special:MergeHistory into T70096: Allow history merge without a redirect.
Oct 20 2023, 11:55 PM · MediaWiki-MergeHistory, Platform Engineering, User-DannyS712
Pppery merged task T213625: Add option to leave redirect in Special:MergeHistory into T70096: Allow history merge without a redirect.
Oct 20 2023, 11:55 PM · MediaWiki-MergeHistory
Pppery added a comment to T341760: Special:MergeHistory should place a null edit in the page's history describing the merge.

A log entry at the _target was separately requested in T118132: Merging pages should add a log entry to the destination page. I personally don't see the point of any of these requests, though - history merging should if done properly be seamless and not need an annotation.

Oct 20 2023, 11:54 PM · MediaWiki-MergeHistory
Pppery merged T108472: Combining history of pages into T121010: Allow bypassing overlapping timestamps check.
Oct 20 2023, 11:53 PM · MediaWiki-MergeHistory
Pppery merged task T108472: Combining history of pages into T121010: Allow bypassing overlapping timestamps check.
Oct 20 2023, 11:53 PM · MediaWiki-MergeHistory
Pppery renamed T121010: Allow bypassing overlapping timestamps check from MergeHistory cannot always merge pages to Allow bypassing overlapping timestamps check.
Oct 20 2023, 11:52 PM · MediaWiki-MergeHistory
Pppery added a comment to T121010: Allow bypassing overlapping timestamps check.

If you know what you are doing you can do this via page moves. This is a major footgun so should be left to that emergent behavior not explicitly supported.

Oct 20 2023, 11:52 PM · MediaWiki-MergeHistory
Pppery added a comment to T70096: Allow history merge without a redirect.

Does this really need to be done? Anyone who has mergehistory access almost always also has delete access so can delete the redirect themselves.

Oct 20 2023, 11:46 PM · MediaWiki-MergeHistory, Platform Engineering, User-DannyS712
Pppery removed projects from T183501: MergeHistory: timestamp-based midpoints are not sufficient: MediaWiki-Page-history, MediaWiki-Page-diffs.
Oct 20 2023, 11:44 PM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory
Pppery added a comment to T183501: MergeHistory: timestamp-based midpoints are not sufficient.

Related: T39465: Can't selectively undelete revisions with same timestamp

Oct 20 2023, 11:44 PM · MW-1.42-notes (1.42.0-wmf.13; 2024-01-09 ), MediaWiki-MergeHistory

Oct 5 2023

DannyS712 placed T70096: Allow history merge without a redirect up for grabs.

I'm sorry that I haven't handled this task. I recently returned from a long bout of unexpected inactivity, and while I plan to resume my contributions here on Phabricator its unfair to claim tasks that I might not work on when others may be interested in handling them. I'm removing myself as the assignee in a batch-action, but if someone feels that I really should be the one to handle this task feel free to re-assign me and I'll take a look.

Oct 5 2023, 9:45 PM · MediaWiki-MergeHistory, Platform Engineering, User-DannyS712

Jul 13 2023

Graham87 added a comment to T341760: Special:MergeHistory should place a null edit in the page's history describing the merge.

Yeah I've thought something like this has been needed for a while. I'd been thinking of the idea of adding a log entry at the _target as well as the source, and that wouldn't go astray either, but that would probably not be so easy ...

Jul 13 2023, 8:52 AM · MediaWiki-MergeHistory
  NODES
HOME 1
Idea 1
idea 1
Note 23
os 20