Show More
@@ -802,9 +802,10 b' class svnsubrepo(abstractsubrepo):' | |||||
802 | def merge(self, state): |
|
802 | def merge(self, state): | |
803 | old = self._state[1] |
|
803 | old = self._state[1] | |
804 | new = state[1] |
|
804 | new = state[1] | |
805 |
|
|
805 | wcrev = self._wcrev() | |
806 | dirty = old == self._wcrev() or self._wcchanged()[0] |
|
806 | if new != wcrev: | |
807 | if _updateprompt(self._ui, self, dirty, self._wcrev(), new): |
|
807 | dirty = old == wcrev or self._wcchanged()[0] | |
|
808 | if _updateprompt(self._ui, self, dirty, wcrev, new): | |||
808 | self.get(state, False) |
|
809 | self.get(state, False) | |
809 |
|
810 | |||
810 | def push(self, opts): |
|
811 | def push(self, opts): |
General Comments 0
You need to be logged in to leave comments.
Login now