diff contrib/simplemerge @ 23116:2dc6b7917cdf stable

clone: fix copying bookmarks in uncompressed clones (issue4430) ef62c66bee1b broke bookmarks getting copied during uncompressed clones. Since most of the pull logic has been moved into exchange.py, lets just call exchange.pull to fix up the repo with the latest bits after the streaming clone has bootstrapped the repo. This keeps us from having to duplicate the bookmark logic.
author Durham Goode <durham@fb.com>
date Fri, 31 Oct 2014 12:56:25 -0700
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff