If there are multiple node type handlers that are interleaved in the Hierarchy, and you move some nodes to modify the interleaving ordering in the main stage, undoing this operation in a stage other than the main stage will not restore the correct interleaving ordering.

This can also happen if the drop operation to move nodes open a prefab stage (like moving prefab children) and you go back to the main stage. Undo will undo the underlying data's modifications but not restore the interleaved ordering.

The issue is that we only have a single hierarchy instance, so any undo/redo is dropped if the hierarchy instance does not match what is stored in undo payload.

Steps to reproduce:

Import the attached script into an Editor folder.
Create a GameObject "Parent" with two children "A" and "B".
Select "A" and run "Hierarchy Tests/Add Test Node After Selected GameObject". Parent shows A, Test Node, B.
Drag "B" above "A". Parent shows B, A, Test Node.
Open any prefab in Prefab Mode.
Undo until the "Reorder Hierarchy" step is undone. Check Edit > Undo History.
Return to the main stage.

Actual results: Interleaved ordering is not restored (moved game object is above the test node).

Expected results: Interleaved ordering is restored (moved game object is below the test node).

Reproducible with versions: 6000.7.0a5, 6000.6.0b7, 7000.0.0a1

Not reproducible with versions:

Can’t test with versions:

Tested on (OS): Windows 11

Notes: