On Wed, 2007-08-15 at 14:27 +0100, Alex Bennee wrote:
Hi,
<snip>
I also slightly formatted the warn output when it detects problems as
multiple line wraps with long file paths where making my eyes bleed :-)
Which I seem to have missed a bunch of crucial ;'s from
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index ee02c56..65c12b2 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -204,9 +204,9 @@ if (@canstatusfiles) {
foreach my $f (@afiles) {
if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
$dirty = 1;
- warn "File $f is already known in your CVS checkout.\n"
- warn " Perhaps it has been added by another user.\n"
- warn " Or this may indicate that it exists on a differentbranch.\n"
+ warn "File $f is already known in your CVS checkout.\n";
+ warn " Perhaps it has been added by another user.\n";
+ warn " Or this may indicate that it exists on a different
branch.\n";
warn " If this is the case, use -f to force the merge.\n";
warn "Status was: $cvsstat{$f}\n";
}
--
Alex, homepage: http://www.bennee.com/~alex/
Love may laugh at locksmiths, but he has a profound respect for money
bags. -- Sidney Paternoster, "The Folly of the Wise"