@matheusbsbs / matheus-bagliano / commits / 538778469c
Fork 0

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

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>

Frank Lichtenheld committed Mar 6, 2007 at 10:42 UTC 538778469ca267c8888bc659d20680c3a1e077fd
1 file changed +3 -3
git-cvsserver.perl
+3 -3
@@ -957,12 +957,12 @@ sub req_update
957 {
958 $log->info("Merged successfully");
959 print "M M $filename\n";
960 - $log->debug("Update-existing $dirpart");
960 + $log->debug("Merged $dirpart");
961
962 # Don't want to actually _DO_ the update if -n specified
963 unless ( $state->{globaloptions}{-n} )
964 {
965 - print "Update-existing $dirpart\n";
965 + print "Merged $dirpart\n";
966 $log->debug($state->{CVSROOT} . "/$state->{module}/$filename");
967 print $state->{CVSROOT} . "/$state->{module}/$filename\n";
968 my $kopts = kopts_from_path($filepart);
@@ -978,7 +978,7 @@ sub req_update
978 # Don't want to actually _DO_ the update if -n specified
979 unless ( $state->{globaloptions}{-n} )
980 {
981 - print "Update-existing $dirpart\n";
981 + print "Merged $dirpart\n";
982 print $state->{CVSROOT} . "/$state->{module}/$filename\n";
983 my $kopts = kopts_from_path($filepart);
984 print "/$filepart/1.$meta->{revision}/+/$kopts/\n";