Mercurial > hg
diff mercurial/subrepo.py @ 15828:4bc715f2a356
subrepo: avoid syncing bookmarks twice on clone (issue3191)
Clone internally handles bookmark synchronization.
(Fix spotted by Eric Blood)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Jan 2012 13:48:42 -0600 |
parents | 5b384b7f48d5 |
children | c654eac03452 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Tue Jan 10 22:35:25 2012 +0800 +++ b/mercurial/subrepo.py Tue Jan 10 13:48:42 2012 -0600 @@ -484,8 +484,8 @@ self._repo.ui.status(_('pulling subrepo %s from %s\n') % (subrelpath(self), srcurl)) self._repo.pull(other) - bookmarks.updatefromremote(self._repo.ui, self._repo, other, - srcurl) + bookmarks.updatefromremote(self._repo.ui, self._repo, other, + srcurl) def get(self, state, overwrite=False): self._get(state)