undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsserver: Use Merged response instead of Update-existing for merged files

Browse Source 
Using Update-existing leads to the client forgetting about the "locally
modified" status of the file which can lead to loss of local changes on
later updates.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Frank Lichtenheld 2007-03-06 10:42:24 +01:00 committed by Junio C Hamano
parent ed8ad7e2e2
commit 538778469c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-cvsserver.perl
View File

@ -957,12 +957,12 @@ sub req_update
{ {
$log->info("Merged successfully"); $log->info("Merged successfully");
print "M M $filename\n"; print "M M $filename\n";
$log->debug("Update-existing $dirpart"); $log->debug("Merged $dirpart");
# Don't want to actually _DO_ the update if -n specified # Don't want to actually _DO_ the update if -n specified
unless ( $state->{globaloptions}{-n} ) unless ( $state->{globaloptions}{-n} )
{ {
print "Update-existing $dirpart\n"; print "Merged $dirpart\n";
$log->debug($state->{CVSROOT} . "/$state->{module}/$filename"); $log->debug($state->{CVSROOT} . "/$state->{module}/$filename");
print $state->{CVSROOT} . "/$state->{module}/$filename\n"; print $state->{CVSROOT} . "/$state->{module}/$filename\n";
my $kopts = kopts_from_path($filepart); my $kopts = kopts_from_path($filepart);
@ -978,7 +978,7 @@ sub req_update
# Don't want to actually _DO_ the update if -n specified # Don't want to actually _DO_ the update if -n specified
unless ( $state->{globaloptions}{-n} ) unless ( $state->{globaloptions}{-n} )
{ {
print "Update-existing $dirpart\n"; print "Merged $dirpart\n";
print $state->{CVSROOT} . "/$state->{module}/$filename\n"; print $state->{CVSROOT} . "/$state->{module}/$filename\n";
my $kopts = kopts_from_path($filepart); my $kopts = kopts_from_path($filepart);
print "/$filepart/1.$meta->{revision}/+/$kopts/\n"; print "/$filepart/1.$meta->{revision}/+/$kopts/\n";