Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
16192:a4413624d014 16197:0196c437ca9f
506 cur = self._repo['.'] 506 cur = self._repo['.']
507 dst = self._repo[state[1]] 507 dst = self._repo[state[1]]
508 anc = dst.ancestor(cur) 508 anc = dst.ancestor(cur)
509 509
510 def mergefunc(): 510 def mergefunc():
511 if anc == cur: 511 if anc == cur and dst.branch() == cur.branch():
512 self._repo.ui.debug("updating subrepo %s\n" % subrelpath(self)) 512 self._repo.ui.debug("updating subrepo %s\n" % subrelpath(self))
513 hg.update(self._repo, state[1]) 513 hg.update(self._repo, state[1])
514 elif anc == dst: 514 elif anc == dst:
515 self._repo.ui.debug("skipping subrepo %s\n" % subrelpath(self)) 515 self._repo.ui.debug("skipping subrepo %s\n" % subrelpath(self))
516 else: 516 else: