Mercurial > hgsubversion

changeset 780:13e24740a500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge backout of 60948939555d.
author Augie Fackler <durin42@gmail.com>
date Sun, 16 Jan 2011 22:50:51 -0600
parents 184d25bc1c0b (diff) d38226a190ad (current diff)
children 16252bea2026
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/svnexternals.py
+++ b/hgsubversion/svnexternals.py
@@ -405,12 +405,12 @@ if subrepo:
                 source = source + '@' + pegrev
             return super(svnsubrepo, self).get((source, state[1]))
 
-        def dirty(self):
+        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]) and not self._wcchanged()[0]:
+                wcrev == self._state[1] or ignoreupdate) and not self._wcchanged()[0]:
                 return False
             return True