[PATCH stable] keyword: fix regressions introduced in d87f3ff904ba (complete fix)

[Christian Ebert]

* Christian Ebert on Sunday, October 24, 2010 at 15:14:10 +0100
> # HG changeset patch
> # User Christian Ebert <blacktrash at gmx.net>
> # Date 1287929501 -3600
> # Branch stable
> # Node ID 9a663e16d9899c7dee01397481cb225f47f85cba
> # Parent  61f48581d8effa72b2229f24a34ba9f9207f8aed
> keyword: fix regressions introduced in d87f3ff904ba
> 
> - dirstate of overwritten files must be forced to normal
>  with kwexpand/kwshrink, not commit.
> - recorded files must be weeded before overwriting.
> - add test cases.

Sorry to be a pain, but could this be sneaked in before 1.7?
Thanks.

c
-- 
theatre - books - texts - movies
Black Trash Productions at home: http://www.blacktrash.org
Black Trash Productions on Facebook:
http://www.facebook.com/blacktrashproductions