Fix case when redo would show the akonadi conflict dialog.

If you create, then, modify, then undo both those operations the
item will be deleted.

When you redo, you'll get a new item, with a different id which we
update internally, but we should also update the revision so we
can redo the modification too.