# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1295239851 21600
# Node ID 13e24740a50029a36cb1b86dc0d17228ec63cf21
# Parent  184d25bc1c0b55e7e41351fd77ff3975f527c848# Parent  d38226a190ad0067782fc38b378701fc9e82555f
Merge backout of 60948939555d.

diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py
--- 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