From: Junio C Hamano Date: Sat, 10 Mar 2007 01:37:14 GMT Subject: Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files Message-ID: <7v4pot281h.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <11731741443228-git-send-email-frank@lichtenheld.de> Frank Lichtenheld writes: > 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. To me, both of these hunks look correct (the first one is clean merge, the second one is merge with conflicts). Ack? > Signed-off-by: Frank Lichtenheld > --- > git-cvsserver.perl | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/git-cvsserver.perl b/git-cvsserver.perl > index 1bf892e..65fcc84 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"; > -- > 1.5.0.2