Sync with hg