Show More
@@ -500,7 +500,7 b' class hgsubrepo(abstractsubrepo):' | |||||
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: |
General Comments 0
You need to be logged in to leave comments.
Login now