Show More
@@ -886,7 +886,8 b' class gitsubrepo(abstractsubrepo):' | |||||
886 | if self.dirty(): |
|
886 | if self.dirty(): | |
887 | if self._gitstate() != revision: |
|
887 | if self._gitstate() != revision: | |
888 | dirty = self._gitstate() == self._state[1] or code != 0 |
|
888 | dirty = self._gitstate() == self._state[1] or code != 0 | |
889 |
if _updateprompt(self._ui, self, dirty, |
|
889 | if _updateprompt(self._ui, self, dirty, | |
|
890 | self._state[1][:7], revision[:7]): | |||
890 | mergefunc() |
|
891 | mergefunc() | |
891 | else: |
|
892 | else: | |
892 | mergefunc() |
|
893 | mergefunc() |
General Comments 0
You need to be logged in to leave comments.
Login now