User:Thejoppyloppy: Difference between revisions

From Test Wiki
← Older edit
Content deleted Content added
VisualWikitext
→Old page history: changed inline styling to class, so i can easily style it with devtools
 
(11 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]]
*right or blue border indicates the history present on [[/sandbox/mergenew]]
===Old page history===
===Old page history===
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;">
<div style="width:100%; border:1px solid gray; border-width: 0 1px 2px 0; padding: 0 1em 1em 0;">
*<span class="mergeold">Created [[/sandbox/mergeold]]</span>
*<div class="mergeold">Created [[/sandbox/mergeold]]</div>
*<span class="mergeold">mold (old, original content. this content should be replaced.)</span>
*<div class="mergeold">mold (old, original content. this content should be replaced.)</div>
*<span class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</span>
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line))</div>
*<span class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</span>
*<div class="mergeold">mold (old, original content. this content should be replaced. (removed 1 line again))</div>
*<span class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</span>
*<div class="mergeold">mold (old, original content. this content should be replaced. (added 3 lines))</div>
*<span class="mergenew">Created [[/sandbox/mergenew]]</span>
*<div class="mergenew">Created [[/sandbox/mergenew]]</div>
*<span class="mergenew">mnew (new stuff. added revision)</span>
*<div class="mergenew">mnew (new stuff. added revision)</div>
*<span class="mergenew">mnew (new stuff. added revision, again)</span>
*<div class="mergenew">mnew (new stuff. added revision, again)</div>
*<span class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</span>
*<div class="mergeold">mold revisions to mergeold ("this is content created after mergenew "had 2 revision added to it after being created")</div>
*<span class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</span>
*<div class="mergeold">mold revisions to mergeold ("this is more content created after mergenew "had 2 revision added to it after being created")</div>
*<span class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</span>
*<div class="mergeold">mold revisions to mergeold ("even more content created after mergenew "had 2 revision added to it after being created")</div>
*<span class="mergenew">mnew A</span>
*<div class="mergenew">mnew A</div>
* <span class="mergenew">mnew B</span>
* <div class="mergenew">mnew B</div>
* <span class="mergeold">mold C</span>
* <div class="mergeold">mold C</div>
* <span class="mergenew">mnew D</span>
* <div class="mergenew">mnew D</div>
* <span class="mergenew">mnew E</span>
* <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 29: 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: <span class="mold">Created [[/sandbox/mergeold]], +4 revisions to mergeold.</span>
*** aka: <div class="mold">Created [[/sandbox/mergeold]], +4 revisions to mergeold.</div>


===New page histories===
===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==
Retrieved from "https://testwiki.wiki/wiki/User:Thejoppyloppy"