diff options
| author | Frank Lichtenheld <frank@lichtenheld.de> | 2007-03-06 10:42:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 22:49:08 -0700 |
| commit | 538778469ca267c8888bc659d20680c3a1e077fd (patch) | |
| tree | e1ee911b54b5e22ec508e58f433317d1d53ae735 /git-cvsserver.perl | |
| parent | ed8ad7e2e29d4adf342964f6cc15d6b84f62c700 (diff) | |
| download | git-538778469ca267c8888bc659d20680c3a1e077fd.tar.gz | |
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>
Diffstat (limited to 'git-cvsserver.perl')
| -rwxr-xr-x | git-cvsserver.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 1bf892e4c1..65fcc84049 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -957,12 +957,12 @@ sub req_update { $log->info("Merged successfully"); 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 unless ( $state->{globaloptions}{-n} ) { - print "Update-existing $dirpart\n"; + print "Merged $dirpart\n"; $log->debug($state->{CVSROOT} . "/$state->{module}/$filename"); print $state->{CVSROOT} . "/$state->{module}/$filename\n"; my $kopts = kopts_from_path($filepart); @@ -978,7 +978,7 @@ sub req_update # Don't want to actually _DO_ the update if -n specified unless ( $state->{globaloptions}{-n} ) { - print "Update-existing $dirpart\n"; + print "Merged $dirpart\n"; print $state->{CVSROOT} . "/$state->{module}/$filename\n"; my $kopts = kopts_from_path($filepart); print "/$filepart/1.$meta->{revision}/+/$kopts/\n"; |