Show More
@@ -200,7 +200,12 b' class hgsubrepo(object):' | |||||
200 |
|
200 | |||
201 | def merge(self, state): |
|
201 | def merge(self, state): | |
202 | self._get(state) |
|
202 | self._get(state) | |
203 | hg.merge(self._repo, state[1], remind=False) |
|
203 | cur = self._repo['.'] | |
|
204 | dst = self._repo[state[1]] | |||
|
205 | if dst.ancestor(cur) == cur: | |||
|
206 | hg.update(self._repo, state[1]) | |||
|
207 | else: | |||
|
208 | hg.merge(self._repo, state[1], remind=False) | |||
204 |
|
209 | |||
205 | def push(self, force): |
|
210 | def push(self, force): | |
206 | # push subrepos depth-first for coherent ordering |
|
211 | # push subrepos depth-first for coherent ordering |
General Comments 0
You need to be logged in to leave comments.
Login now