# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1182480126 10800
# Node ID de8ec7e1753abd09c3af64b9f7236f7fdede6f09
# Parent  0f6e2b37512d7a3d07c281b7843fabe8aeb48cf4
dirstate.status: if a file is marked as copied, consider it modified

After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -472,8 +472,9 @@ class dirstate(object):
             if type_ == 'n':
                 if not st:
                     st = os.lstat(self.wjoin(fn))
-                if size >= 0 and (size != st.st_size
-                                  or (mode ^ st.st_mode) & 0100):
+                if (size >= 0 and (size != st.st_size
+                                   or (mode ^ st.st_mode) & 0100)
+                    or fn in self._copymap):
                     modified.append(fn)
                 elif time != int(st.st_mtime):
                     lookup.append(fn)
diff --git a/tests/test-copy2 b/tests/test-copy2
--- a/tests/test-copy2
+++ b/tests/test-copy2
@@ -44,4 +44,10 @@ hg add baz
 hg cp -A bar baz
 hg st -C
 
+echo "# foo was clean:"
+hg st -AC foo
+echo "# but it's considered modified after a copy --after --force"
+hg copy -Af bar foo
+hg st -AC foo
+
 exit 0
diff --git a/tests/test-copy2.out b/tests/test-copy2.out
--- a/tests/test-copy2.out
+++ b/tests/test-copy2.out
@@ -23,3 +23,8 @@ bar renamed from foo:dd12c926cf165e3eb4c
 # copy --after on an added file
 A baz
   bar
+# foo was clean:
+C foo
+# but it's considered modified after a copy --after --force
+M foo
+  bar