Re: [PATCH] cvsserver: Fix handling of diappeared files on update

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Frank Lichtenheld <frank@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx>
> ---
>  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?

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]