# HG changeset patch # User Patrick Mezard # Date 1295818902 -3600 # Node ID 16252bea2026a9cee79eb14267b88a31a86baf78 # Parent 13e24740a50029a36cb1b86dc0d17228ec63cf21 svnexternals: update subrepo after mercurial changes diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py --- a/hgsubversion/svnexternals.py +++ b/hgsubversion/svnexternals.py @@ -408,9 +408,14 @@ if subrepo: def dirty(self, ignoreupdate=False): # You cannot compare anything with HEAD. Just accept it # can be anything. - wcrev = self._wcrev() - if (wcrev == 'HEAD' or self._state[1] == 'HEAD' or - wcrev == self._state[1] or ignoreupdate) and not self._wcchanged()[0]: + if hasattr(self, '_wcrevs'): + wcrevs = self._wcrevs() + else: + wcrev = self._wcrev() + wcrevs = (wcrev, wcrev) + if (('HEAD' in wcrevs or self._state[1] == 'HEAD' or + self._state[1] in wcrevs or ignoreupdate) + and not self._wcchanged()[0]): return False return True