User:Thejoppyloppy: Difference between revisions
From Test Wiki
Content deleted Content added
| (3 intermediate revisions by the same user not shown) | |||
| Line 70: | Line 70: | ||
*<div class="mergeold">mnew (new stuff. added revision)</div> |
*<div class="mergeold">mnew (new stuff. added revision)</div> |
||
*<div class="mergeold">mnew (new stuff. added revision, again)</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 A</div> |
||
* <div class="mergeold">mnew B</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 D</div> |
||
* <div class="mergeold">mnew E</div> |
* <div class="mergeold">mnew E</div> |
||
