subrepo: do a linear update when appropriate

mercurial/subrepo.py

@@ -200,6 +200,11 class hgsubrepo(object):
 
     def merge(self, state):
         self._get(state)
+        cur = self._repo['.']
+        dst = self._repo[state[1]]
+        if dst.ancestor(cur) == cur:
+            hg.update(self._repo, state[1])
+        else:
         hg.merge(self._repo, state[1], remind=False)
 
     def push(self, force):