diff options
| -rwxr-xr-x | git-cvsserver.perl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 65fcc84049..f21f2f121f 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -947,6 +947,7 @@ sub req_update # we need to merge with the local changes ( M=successful merge, C=conflict merge ) $log->info("Merging $file_local, $file_old, $file_new"); + print "M Merging differences between 1.$oldmeta->{revision} and 1.$meta->{revision} into $filename\n"; $log->debug("Temporary directory for merge is $dir"); @@ -973,6 +974,7 @@ sub req_update elsif ( $return == 1 ) { $log->info("Merged with conflicts"); + print "E cvs update: conflicts found in $filename\n"; print "M C $filename\n"; # Don't want to actually _DO_ the update if -n specified @@ -1207,9 +1209,15 @@ sub req_ci if ( defined $meta->{filehash} && $meta->{filehash} eq "deleted" ) { + print "M new revision: delete\n"; print "Remove-entry $dirpart\n"; print "$filename\n"; } else { + if ($meta->{revision} == 1) { + print "M initial revision: 1.1\n"; + } else { + print "M new revision: 1.$meta->{revision}\n"; + } print "Checked-in $dirpart\n"; print "$filename\n"; my $kopts = kopts_from_path($filepart); |