Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 10252:0bc93fa2cf2b
merge with stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Fri, 15 Jan 2010 21:32:53 +0100 |
| parents | 192c39586787 a19d2993385d |
| children | d6512b3e9ac0 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Fri Jan 15 10:38:11 2010 +0100 +++ b/mercurial/subrepo.py Fri Jan 15 21:32:53 2010 +0100 @@ -231,9 +231,12 @@ self._get(state) cur = self._repo['.'] dst = self._repo[state[1]] - if dst.ancestor(cur) == cur: + anc = dst.ancestor(cur) + if anc == cur: self._repo.ui.debug("updating subrepo %s\n" % self._path) hg.update(self._repo, state[1]) + elif anc == dst: + self._repo.ui.debug("skipping subrepo %s\n" % self._path) else: self._repo.ui.debug("merging subrepo %s\n" % self._path) hg.merge(self._repo, state[1], remind=False)