equal
deleted
inserted
replaced
207 |
207 |
208 def merge(self, state): |
208 def merge(self, state): |
209 self._get(state) |
209 self._get(state) |
210 cur = self._repo['.'] |
210 cur = self._repo['.'] |
211 dst = self._repo[state[1]] |
211 dst = self._repo[state[1]] |
212 if dst.ancestor(cur) == cur: |
212 anc = dst.ancestor(cur) |
|
213 if anc == cur: |
213 self._repo.ui.debug("updating subrepo %s\n" % self._path) |
214 self._repo.ui.debug("updating subrepo %s\n" % self._path) |
214 hg.update(self._repo, state[1]) |
215 hg.update(self._repo, state[1]) |
|
216 elif anc == dst: |
|
217 self._repo.ui.debug("skipping subrepo %s\n" % self._path) |
215 else: |
218 else: |
216 self._repo.ui.debug("merging subrepo %s\n" % self._path) |
219 self._repo.ui.debug("merging subrepo %s\n" % self._path) |
217 hg.merge(self._repo, state[1], remind=False) |
220 hg.merge(self._repo, state[1], remind=False) |
218 |
221 |
219 def push(self, force): |
222 def push(self, force): |