[PATCH] Don't propagate SKIPPED warning to future commits.

Here's a simple bug fix for the (currently undocumented) -S flag to
git-cvsimport.

The -S flag allows an import to proceed in the face of a missing ,v
file in the CVS repository. It marks this by adding a SKIPPED warning
in the relevant commit.

Without this patch, the SKIPPED warning propagates to all future
commits, (and accumulates with future SKIPPED warnings).

Martin did the original work on -S to fix an import of the cairo
repository.

However, I just discovered that a correct fix for the cairo import
problem was for me to just "rm -rf ~/.cvsps". (I suppose calling with
a -x option would have worked too.)

I don't know how common it is for CVS repositories to change in ways
such that the cvsps cache gets totally confused as in my case, but it
might be worth adding something to cvsimport to help this. Some
options could be:

 * Use cvsps -x always, to ignore the cache.

 * Warn the user, (perhaps emit some description of stale cache
   possibility if the import fails?).

 * Add a note to the documentation.

Signed-off-by: Carl Worth <redacted>

---

 git-cvsimport.perl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

c816d743a1faf65fb209273a471b15c7b51b55df

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 6b63aa2..25db0ed 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl

@@ -749,6 +749,7 @@ my $commit = sub {
 	if (@skipped) {
 	    $logmsg .= "\n\n\nSKIPPED:\n\t";
 	    $logmsg .= join("\n\t", @skipped) . "\n";
+	    @skipped = ();
 	}
 
 	print $pw "$logmsg\n"

-- 
1.1.6.g9da5