equal
deleted
inserted
replaced
498 cur = self._repo['.'] |
498 cur = self._repo['.'] |
499 dst = self._repo[state[1]] |
499 dst = self._repo[state[1]] |
500 anc = dst.ancestor(cur) |
500 anc = dst.ancestor(cur) |
501 |
501 |
502 def mergefunc(): |
502 def mergefunc(): |
503 if anc == cur: |
503 if anc == cur and dst.branch() == cur.branch(): |
504 self._repo.ui.debug("updating subrepo %s\n" % subrelpath(self)) |
504 self._repo.ui.debug("updating subrepo %s\n" % subrelpath(self)) |
505 hg.update(self._repo, state[1]) |
505 hg.update(self._repo, state[1]) |
506 elif anc == dst: |
506 elif anc == dst: |
507 self._repo.ui.debug("skipping subrepo %s\n" % subrelpath(self)) |
507 self._repo.ui.debug("skipping subrepo %s\n" % subrelpath(self)) |
508 else: |
508 else: |