From: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Date: Sun, 14 Oct 2012 05:42:17 +0000 (-0600)
Subject: cvsserver update: comment about how we shouldn't remove a user-modified file
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8574ff209d9c68674bd6ba3bcee4a7cdb699e61;p=git.git

cvsserver update: comment about how we shouldn't remove a user-modified file

Instead of a comment, we should really add test cases and actually fix it.

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 595865c18..cc39b6bfd 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -1144,6 +1144,10 @@ sub req_update
 
         if ( $meta->{filehash} eq "deleted" )
         {
+            # TODO: If it has been modified in the sandbox, error out
+            #   with the appropriate message, rather than deleting a modified
+            #   file.
+
             my ( $filepart, $dirpart ) = filenamesplit($filename,1);
 
             $log->info("Removing '$filename' from working copy (no longer in the repo)");