Fix a regression on svn cp|ren|mv on gcl upload.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 655 matching lines @@
     if sys.platform.startswith("win"):
       parent_dir = tempfile.gettempdir()
     else:
       parent_dir = sys.path[0]  # tempdir is not secure.
     bogus_dir = os.path.join(parent_dir, "temp_svn_config")
     if not os.path.exists(bogus_dir):
       os.mkdir(bogus_dir)
     output = RunShell(["svn", "diff", "--config-dir", bogus_dir, file])
     if output:
       diff.append(output)
-    # On Posix platforms, svn diff on a mv/cp'd file outputs nothing.
-    # We put in an empty Index entry so upload.py knows about them.
-    elif not sys.platform.startswith("win") and IsSVNMoved(file):
+    elif IsSVNMoved(file):
+      #  svn diff on a mv/cp'd file outputs nothing.
+      # We put in an empty Index entry so upload.py knows about them.
       diff.append("\nIndex: %s\n" % file)
+    else:
+      # The file is not modified anymore. It should be removed from the set.
+      pass
   os.chdir(previous_cwd)
   return "".join(diff)
 
 
 def UploadCL(change_info, args):
   if not change_info.FileList():
     print "Nothing to upload, changelist is empty."
     return
 
   if not "--no_presubmit" in args:
@@ skipping 399 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())