comparison mercurial/localrepo.py @ 22659:798185707833

pull: merge bookmark updates and imports We do all the things in one go now, updating existing bookmark, adding new ones, and overwriting the ones explicitly specified for --bookmark. This impacts the tests by removing some duplicated or unnecessary output.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 28 Sep 2014 14:07:56 -0700
parents 6e431e1635b6
children bf0b5bfc24b9
comparison
equal deleted inserted replaced
22658:a8f0d8e4c80a 22659:798185707833