User:Thejoppyloppy: Difference between revisions
Jump to navigation
Jump to search
Content deleted Content added
No edit summary |
|||
| (13 intermediate revisions by the same user not shown) | |||
| Line 2: | Line 2: | ||
==merge notes== |
==merge notes== |
||
*left, or orange border indicates the history present on [[/sandbox/mergeold]] |
|||
<div style="width:400px; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
* |
*right or blue border indicates the history present on [[/sandbox/mergenew]] |
||
===Old page history=== |
|||
*<span style="border:1px solid orange; float:right">+4 revisions to mergeold<span> |
|||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
*<div class="mergeold">Created [[/sandbox/mergeold]]</div> |
|||
*<span style="border:1px solid blue>+2 revisions to mergenew<br/> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced.)</div> |
|||
*<span style="border:1px solid orange; float:right">+3 revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")<span> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</div> |
|||
*<span style="border:1px solid blue>+1 revision to mergenew (which is this description term/description) this edit will be considered "A" |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</div> |
|||
* <span style="border:1px solid blue>B, +1 revision to mergenew |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</div> |
|||
* <span style="border:1px solid orange; float:right">C, +1 revision to mergeold<span> |
|||
*<div class="mergenew">Created [[/sandbox/mergenew]]</div> |
|||
* <span style="border:1px solid blue>D, +1 revision to mergenew |
|||
*<div class="mergenew">mnew (new stuff. added revision)</div> |
|||
* <span style="border:1px solid blue>E, +1 revision to mergenew |
|||
*<div class="mergenew">mnew (new stuff. added revision, again)</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergenew">mnew A</div> |
|||
* <div class="mergenew">mnew B</div> |
|||
* <div class="mergeold">mold C</div> |
|||
* <div class="mergenew">mnew D</div> |
|||
* <div class="mergenew">mnew E</div> |
|||
</div> |
</div> |
||
5 revisions of User:Thejoppyloppy/sandbox/mergeold were merged into User:Thejoppyloppy/sandbox/mergenew. |
5 revisions of User:Thejoppyloppy/sandbox/mergeold were merged into User:Thejoppyloppy/sandbox/mergenew. |
||
| Line 22: | Line 31: | ||
**(prev) 16:11, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced.) |
**(prev) 16:11, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced.) |
||
**(prev) 16:08, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 61 bytes (recreating page that was previously deleted. page is mergeold) |
**(prev) 16:08, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 61 bytes (recreating page that was previously deleted. page is mergeold) |
||
*** aka: < |
*** aka: <div class="mold">Created [[/sandbox/mergeold]], +4 revisions to mergeold.</div> |
||
===New page histories=== |
|||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
*<div class="mergenew">Created [[/sandbox/mergeold]]</div> |
|||
*<div class="mergenew">mold (old, original content. this content should be replaced.)</div> |
|||
*<div class="mergenew">mold (old, original content. this content should be replaced. (removed 1 line))</div> |
|||
*<div class="mergenew">mold (old, original content. this content should be replaced. (removed 1 line again))</div> |
|||
*<div class="mergenew">mold (old, original content. this content should be replaced. (added 3 lines))</div> |
|||
*<div class="mergenew">Created [[/sandbox/mergenew]]</div> |
|||
*<div class="mergenew">mnew (new stuff. added revision)</div> |
|||
*<div class="mergenew">mnew (new stuff. added revision, again)</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergenew">mnew A</div> |
|||
* <div class="mergenew">mnew B</div> |
|||
* <div class="mergeold">mold C</div> |
|||
* <div class="mergenew">mnew D</div> |
|||
* <div class="mergenew">mnew E</div> |
|||
</div> |
|||
==moving and replacing existing page history== |
|||
what happens if, after the mergin ([[#New page histories]]), I move mergenew into mergeold with NO redirect, while deleting the original mergeold to make way for the move, then restore the original mergeolds logs? |
|||
guessing that both page histories will be mixed into the resulting page (which would be mergold) |
|||
===New page history after move=== |
|||
'''Process:''' mergenew -> mergeold, without leaving a redirect. deleting original mergeold. |
|||
the resulting, new mergeold page: |
|||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
*<div class="mergeold">Created [[/sandbox/mergeold]]</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced.)</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</div> |
|||
*<div class="mergeold">Created [[/sandbox/mergenew]]</div> |
|||
*<div class="mergeold">mnew (new stuff. added revision)</div> |
|||
*<div class="mergeold">mnew (new stuff. added revision, again)</div> |
|||
*(nothing is here, it was deleted) |
|||
*(nothing is here, it was deleted) |
|||
*(nothing is here, it was deleted) |
|||
*<div class="mergeold">mnew A</div> |
|||
* <div class="mergeold">mnew B</div> |
|||
*deleted |
|||
* <div class="mergeold">mnew D</div> |
|||
* <div class="mergeold">mnew E</div> |
|||
</div> |
|||
actual content is: |
|||
the revisions from the move's destination page's history (mergeold) are overwritten by the revisions from the source page's history (mergenew) |
|||
content from mergenew overwrites mergeold page, and the name results in mergeold. |
|||
There is some content missing (because it was deleted in the move), which i will restore: |
|||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
*<div class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</div> |
|||
* <div class="mergeold">mold C</div> |
|||
</div> |
|||
===Page history after undelete=== |
|||
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;"> |
|||
*<div class="mergeold">Created [[/sandbox/mergeold]]</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced.)</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</div> |
|||
*<div class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</div> |
|||
*<div class="mergeold">Created [[/sandbox/mergenew]]</div> |
|||
*<div class="mergeold">mnew (new stuff. added revision)</div> |
|||
*<div class="mergeold">mnew (new stuff. added revision, again)</div> |
|||
*<div class="mergeold">mnew A</div> |
|||
* <div class="mergeold">mnew B</div> |
|||
* <div class="mergeold">mold C</div> |
|||
* <div class="mergeold">mnew D</div> |
|||
* <div class="mergeold">mnew E</div> |
|||
</div> |
|||
==Subpages== |
==Subpages== |
||
Latest revision as of 03:17, 28 March 2025
I work on signalis.wiki.gg as an Administrator, Interface Administrator, and Permissions Manager (wiki-specific Bureaucrat).
merge notes
[edit | edit source]- left, or orange border indicates the history present on /sandbox/mergeold
- right or blue border indicates the history present on /sandbox/mergenew
Old page history
[edit | edit source]- Created /sandbox/mergeold
- mold (old, original content. this content should be replaced.)
- mold (old, original content. this content should be replaced. (removed 1 line))
- mold (old, original content. this content should be replaced. (removed 1 line again))
- mold (old, original content. this content should be replaced. (added 3 lines))
- Created /sandbox/mergenew
- mnew (new stuff. added revision)
- mnew (new stuff. added revision, again)
- mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")
- mnew A
- mnew B
- mold C
- mnew D
- mnew E
5 revisions of User:Thejoppyloppy/sandbox/mergeold were merged into User:Thejoppyloppy/sandbox/mergenew.
- source = mergeold
destination = mergenew - unable to merge all due to "overlapping page histories", so the radio button column was used to merge "only the revisions created at and before the specified time", which where (in reverse chronological):
- (prev) 16:27, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced. (added 3 lines)) Tag: Manual revert
- (prev) 16:26, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 121 bytes (old, original content. this content should be replaced. (removed 1 line again)) Tag: Reverted
- (prev) 16:26, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 182 bytes (old, original content. this content should be replaced. (removed 1 line)) Tag: Reverted
- (prev) 16:11, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 243 bytes (old, original content. this content should be replaced.)
- (prev) 16:08, 27 March 2025 . . Thejoppyloppy (talk | contribs | block) 61 bytes (recreating page that was previously deleted. page is mergeold)
- aka: Created /sandbox/mergeold, +4 revisions to mergeold.
- aka:
New page histories
[edit | edit source]- Created /sandbox/mergeold
- mold (old, original content. this content should be replaced.)
- mold (old, original content. this content should be replaced. (removed 1 line))
- mold (old, original content. this content should be replaced. (removed 1 line again))
- mold (old, original content. this content should be replaced. (added 3 lines))
- Created /sandbox/mergenew
- mnew (new stuff. added revision)
- mnew (new stuff. added revision, again)
- mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")
- mnew A
- mnew B
- mold C
- mnew D
- mnew E
moving and replacing existing page history
[edit | edit source]what happens if, after the mergin (#New page histories), I move mergenew into mergeold with NO redirect, while deleting the original mergeold to make way for the move, then restore the original mergeolds logs? guessing that both page histories will be mixed into the resulting page (which would be mergold)
New page history after move
[edit | edit source]Process: mergenew -> mergeold, without leaving a redirect. deleting original mergeold.
the resulting, new mergeold page:
- Created /sandbox/mergeold
- mold (old, original content. this content should be replaced.)
- mold (old, original content. this content should be replaced. (removed 1 line))
- mold (old, original content. this content should be replaced. (removed 1 line again))
- mold (old, original content. this content should be replaced. (added 3 lines))
- Created /sandbox/mergenew
- mnew (new stuff. added revision)
- mnew (new stuff. added revision, again)
- (nothing is here, it was deleted)
- (nothing is here, it was deleted)
- (nothing is here, it was deleted)
- mnew A
- mnew B
- deleted
- mnew D
- mnew E
actual content is: the revisions from the move's destination page's history (mergeold) are overwritten by the revisions from the source page's history (mergenew) content from mergenew overwrites mergeold page, and the name results in mergeold.
There is some content missing (because it was deleted in the move), which i will restore:
- mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")
- mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")
- mold C
Page history after undelete
[edit | edit source]- Created /sandbox/mergeold
- mold (old, original content. this content should be replaced.)
- mold (old, original content. this content should be replaced. (removed 1 line))
- mold (old, original content. this content should be replaced. (removed 1 line again))
- mold (old, original content. this content should be replaced. (added 3 lines))
- Created /sandbox/mergenew
- mnew (new stuff. added revision)
- mnew (new stuff. added revision, again)
- mnew A
- mnew B
- mold C
- mnew D
- mnew E