facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

subrepo/svn: cache _wcrev() value in merge()

Browse Source
This commit is contained in:
Patrick Mezard 2012-04-30 17:05:19 +02:00
parent 5e78cfbfbb
commit ac389a393c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/subrepo.py
View File

@ -802,9 +802,10 @@ class svnsubrepo(abstractsubrepo):
def merge(self, state):
old = self._state[1]
new = state[1]
if new != self._wcrev():
dirty = old == self._wcrev() or self._wcchanged()[0]
if _updateprompt(self._ui, self, dirty, self._wcrev(), new):
wcrev = self._wcrev()
if new != wcrev:
dirty = old == wcrev or self._wcchanged()[0]
if _updateprompt(self._ui, self, dirty, wcrev, new):
self.get(state, False)
def push(self, opts):