From: Carl Worth <cworth@cworth.org>
To: git@vger.kernel.org
Subject: [PATCH] Don't propagate SKIPPED warning to future commits.
Date: Fri, 10 Feb 2006 17:41:28 -0800 [thread overview]
Message-ID: <87r76avfhz.wl%cworth@cworth.org> (raw)
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 <cworth@cworth.org>
---
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
next reply other threads:[~2006-02-11 1:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-11 1:41 Carl Worth [this message]
2006-02-11 2:21 ` [PATCH] Don't propagate SKIPPED warning to future commits Junio C Hamano
2006-02-11 14:47 ` Carl Worth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r76avfhz.wl%cworth@cworth.org \
--to=cworth@cworth.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).