cvsserver bug

> It seems like git-cvsserver doesn't know the CVS special case that, if the 
> client has removed the file from the working directory (but not called 
> "cvs remove"), this means to revert it to the server's version. I think 
> that the condition around line 843 needs to exclude this case, and it 
> needs to get to line 892 instead, but I can't even fake perl to fix it.

> Only send a modified response if the client sent a
> "Modified" entry. This fixes the case where the
> file was locally deleted on the client without
> being removed from CVS. In this case the client
> will only have sent the Entry for the file but nothing
> else.
>
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
> ---
>  git-cvsserver.perl |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
>  We really, really need a test suite for cvsserver...
>  I've tested this as good for regressions as I could
>  think of but am still unsure about it.
>
> diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> index 68aa752..25816c5 100755
> --- a/git-cvsserver.perl
> +++ b/git-cvsserver.perl
> @@ -843,6 +843,7 @@ sub req_update
>          if ( defined ( $wrev )
>               and defined($meta->{revision})
>               and $wrev == $meta->{revision}
> +             and defined($state->{entries}{$filename}{modified_hash})
>               and not exists ( $state->{opt}{C} ) )
>          {
>              $log->info("Tell the client the file is modified");
> -- 
> 1.5.1

> Frank Lichtenheld <frank@lichtenheld.de> writes:
> 
> > Only send a modified response if the client sent a
> > "Modified" entry. This fixes the case where the
> > file was locally deleted on the client without
> > being removed from CVS. In this case the client
> > will only have sent the Entry for the file but nothing
> > else.
> >
> > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
> > ---
> >  git-cvsserver.perl |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> >
> >  We really, really need a test suite for cvsserver...
> >  I've tested this as good for regressions as I could
> >  think of but am still unsure about it.
> >
> > diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> > index 68aa752..25816c5 100755
> > --- a/git-cvsserver.perl
> > +++ b/git-cvsserver.perl
> > @@ -843,6 +843,7 @@ sub req_update
> >          if ( defined ( $wrev )
> >               and defined($meta->{revision})
> >               and $wrev == $meta->{revision}
> > +             and defined($state->{entries}{$filename}{modified_hash})
> >               and not exists ( $state->{opt}{C} ) )
> >          {
> >              $log->info("Tell the client the file is modified");
> > -- 
> > 1.5.1
> 
> This would make the modified response go away, but would it
> cause a fresh re-checkout to happen?

> Only send a modified response if the client sent a
> "Modified" entry. This fixes the case where the
> file was locally deleted on the client without
> being removed from CVS. In this case the client
> will only have sent the Entry for the file but nothing
> else.
> 
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>

> Frank Lichtenheld wrote:
> > Only send a modified response if the client sent a
> > "Modified" entry. This fixes the case where the
> > file was locally deleted on the client without
> > being removed from CVS. In this case the client
> > will only have sent the Entry for the file but nothing
> > else.
> > 
> > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
> 
> Ack. With this, git-cvsserver matches cvs's behaviour. The only
> difference is that cvs also spits out
> 
>   E cvs update: warning: $path was lost