[quote=BrobyDDark]
Meh, but the robot was based off what would have happened. And it wasn't the robot until the Doctor intervened.
[/quote]

Well no, the whole point was that what they showed the first time was the robot all along. When the Doctor realized he was going to die, he arranged the whole thing with the people who controlled that robot - and his fake death was what Amy/Rory/River saw in the first place that set the whole story arc in motion. The past technically never changed, unless you count the temporary unraveling of time itself when things did deviate from what his companions originally witnessed.

Wibbly-wobbly-timey-whimey. :3