[client] Fix a bug in merge.
[server] Improve repo size computation.

* Count file sizes instead of block sizes;
* Computer one repo size every second;
* Fix a memory bug.