Mercurial > hg

changeset 15828:4bc715f2a356

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1dacf7672556
children 2c480532f36e
files mercurial/subrepo.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
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)