Lock the space row before moving main_revision

Locks the space row before any merge or edit moves main_revision and re-reads data after the wait, so two merges into one space no longer drop one of the changes.