Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: avoid syncing bookmarks twice on clone (issue3191)
authorMatt Mackall <mpm@selenic.com>
Tue, 10 Jan 2012 13:48:42 -0600
changeset 15828 4bc715f2a356
parent 15827 1dacf7672556
child 15829 2c480532f36e
subrepo: avoid syncing bookmarks twice on clone (issue3191) Clone internally handles bookmark synchronization. (Fix spotted by Eric Blood)
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial