-- times out and throws an exception if we can't get a lock on the in-memory diff by 10 seconds