# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319294628 -3600
# Node ID df7e78af0d9fe4ff974d73b13d6e830ca3e0e89b
# Parent  ab082912af32141fb0e3fc4b1bca2ff51069239f# Parent  68475648cd7e889535bbc4e85be1992f48680fa6
Merge with stable

diff -r ab082912af32 -r df7e78af0d9f hgkw/keyword.py
--- 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)