branch | stable |
changeset 21565 | 7f7f634d073d |
parent 21564 | 2e91d4964ecd |
child 21566 | a01988cd9b61 |
--- a/mercurial/subrepo.py Thu May 08 19:03:00 2014 +0900 +++ b/mercurial/subrepo.py Thu May 08 19:03:00 2014 +0900 @@ -1392,6 +1392,7 @@ if tracking[remote] != self._gitcurrentbranch(): checkout([tracking[remote]]) self._gitcommand(['merge', '--ff', remote]) + _sanitize(self._ui, self._path) else: # a real merge would be required, just checkout the revision rawcheckout()