Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sat, 22 Oct 2011 15:43:48 +0100
changeset 992 df7e78af0d9f
parent 990 ab082912af32 (current diff)
parent 991 68475648cd7e (diff)
child 993 e50f10baa81a
Merge with stable
--- a/hgkw/keyword.py	Sun Oct 16 15:32:04 2011 +0100
+++ b/hgkw/keyword.py	Sat Oct 22 15:43:48 2011 +0100
@@ -590,12 +590,12 @@
                 kwt.restrict = restrict
             return n
 
-        def rollback(self, dryrun=False):
+        def rollback(self, dryrun=False, force=False):
             wlock = self.wlock()
             try:
                 if not dryrun:
                     changed = self['.'].files()
-                ret = super(kwrepo, self).rollback(dryrun)
+                ret = super(kwrepo, self).rollback(dryrun, force)
                 if not dryrun:
                     ctx = self['.']
                     modified, added = _preselect(self[None].status(), changed)