Mercurial > public > mercurial-scm > hg

diff mercurial/subrepo.py @ 16197:0196c437ca9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 29 Feb 2012 17:27:24 -0600
parents bcb973abcc0b 8ae7626d8bf1
children 71dcce391a44
line wrap: on
line diff
--- a/mercurial/subrepo.py	Tue Feb 28 21:17:53 2012 -0600
+++ b/mercurial/subrepo.py	Wed Feb 29 17:27:24 2012 -0600
@@ -508,7 +508,7 @@
         anc = dst.ancestor(cur)
 
         def mergefunc():
-            if anc == cur:
+            if anc == cur and dst.branch() == cur.branch():
                 self._repo.ui.debug("updating subrepo %s\n" % subrelpath(self))
                 hg.update(self._repo, state[1])
             elif anc == dst: