equal
deleted
inserted
replaced
800 self._ui.status(status) |
800 self._ui.status(status) |
801 |
801 |
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 if new != self._wcrev(): |
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): |
811 # push is a no-op for SVN |
812 # push is a no-op for SVN |
812 return True |
813 return True |