{"thread":{"id":"7151","subject":"[PATCH] cvsserver: Use Merged response instead of Update-existing for merged files","startedAt":"2007-03-06T09:42:24Z","lastAt":"2007-03-11T22:21:37Z","messageCount":3,"participants":["Frank Lichtenheld","Junio C Hamano","Martin Langhoff"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"36613","messageId":"11731741443228-git-send-email-frank@lichtenheld.de","threadId":"7151","inReplyTo":null,"subject":"[PATCH] cvsserver: Use Merged response instead of Update-existing for merged files","fromName":"Frank Lichtenheld","fromEmail":"frank@lichtenheld.de","sentAt":"2007-03-06T09:42:24Z","receivedAt":"2007-03-06T09:42:24Z","isPatch":true,"sender":{"key":"frank@lichtenheld.de","avatar":"https://gravatar.com/avatar/b9f1d4b120e138f157c9e480d0818197c474628923786adb98f30017cdb99c3c?d=mp&s=160"},"body":"Using Update-existing leads to the client forgetting about the \"locally\nmodified\" status of the file which can lead to loss of local changes on\nlater updates.\n\nSigned-off-by: Frank Lichtenheld <frank@lichtenheld.de>\n---\n git-cvsserver.perl |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-cvsserver.perl b/git-cvsserver.perl\nindex 1bf892e..65fcc84 100755\n--- a/git-cvsserver.perl\n+++ b/git-cvsserver.perl\n@@ -957,12 +957,12 @@ sub req_update\n             {\n                 $log->info(\"Merged successfully\");\n                 print \"M M $filename\\n\";\n-                $log->debug(\"Update-existing $dirpart\");\n+                $log->debug(\"Merged $dirpart\");\n \n                 # Don't want to actually _DO_ the update if -n specified\n                 unless ( $state->{globaloptions}{-n} )\n                 {\n-                    print \"Update-existing $dirpart\\n\";\n+                    print \"Merged $dirpart\\n\";\n                     $log->debug($state->{CVSROOT} . \"/$state->{module}/$filename\");\n                     print $state->{CVSROOT} . \"/$state->{module}/$filename\\n\";\n                     my $kopts = kopts_from_path($filepart);\n@@ -978,7 +978,7 @@ sub req_update\n                 # Don't want to actually _DO_ the update if -n specified\n                 unless ( $state->{globaloptions}{-n} )\n                 {\n-                    print \"Update-existing $dirpart\\n\";\n+                    print \"Merged $dirpart\\n\";\n                     print $state->{CVSROOT} . \"/$state->{module}/$filename\\n\";\n                     my $kopts = kopts_from_path($filepart);\n                     print \"/$filepart/1.$meta->{revision}/+/$kopts/\\n\";\n-- \n1.5.0.2\n"},{"id":"36712","messageId":"7v4pot281h.fsf@assigned-by-dhcp.cox.net","threadId":"7151","inReplyTo":"11731741443228-git-send-email-frank@lichtenheld.de","subject":"Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-03-10T01:37:14Z","receivedAt":"2007-03-10T01:37:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Frank Lichtenheld <frank@lichtenheld.de> writes:\n\n> Using Update-existing leads to the client forgetting about the \"locally\n> modified\" status of the file which can lead to loss of local changes on\n> later updates.\n\nTo me, both of these hunks look correct (the first one is clean\nmerge, the second one is merge with conflicts).  Ack?\n\n> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>\n> ---\n>  git-cvsserver.perl |    6 +++---\n>  1 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/git-cvsserver.perl b/git-cvsserver.perl\n> index 1bf892e..65fcc84 100755\n> --- a/git-cvsserver.perl\n> +++ b/git-cvsserver.perl\n> @@ -957,12 +957,12 @@ sub req_update\n>              {\n>                  $log->info(\"Merged successfully\");\n>                  print \"M M $filename\\n\";\n> -                $log->debug(\"Update-existing $dirpart\");\n> +                $log->debug(\"Merged $dirpart\");\n>  \n>                  # Don't want to actually _DO_ the update if -n specified\n>                  unless ( $state->{globaloptions}{-n} )\n>                  {\n> -                    print \"Update-existing $dirpart\\n\";\n> +                    print \"Merged $dirpart\\n\";\n>                      $log->debug($state->{CVSROOT} . \"/$state->{module}/$filename\");\n>                      print $state->{CVSROOT} . \"/$state->{module}/$filename\\n\";\n>                      my $kopts = kopts_from_path($filepart);\n> @@ -978,7 +978,7 @@ sub req_update\n>                  # Don't want to actually _DO_ the update if -n specified\n>                  unless ( $state->{globaloptions}{-n} )\n>                  {\n> -                    print \"Update-existing $dirpart\\n\";\n> +                    print \"Merged $dirpart\\n\";\n>                      print $state->{CVSROOT} . \"/$state->{module}/$filename\\n\";\n>                      my $kopts = kopts_from_path($filepart);\n>                      print \"/$filepart/1.$meta->{revision}/+/$kopts/\\n\";\n> -- \n> 1.5.0.2\n"},{"id":"36877","messageId":"46a038f90703111521h59079864q9c9f5d922c92dc99@mail.gmail.com","threadId":"7151","inReplyTo":"7v4pot281h.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2007-03-11T22:21:37Z","receivedAt":"2007-03-11T22:21:37Z","isPatch":true,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 3/10/07, Junio C Hamano <junkio@cox.net> wrote:\n> Frank Lichtenheld <frank@lichtenheld.de> writes:\n>\n> > Using Update-existing leads to the client forgetting about the \"locally\n> > modified\" status of the file which can lead to loss of local changes on\n> > later updates.\n>\n> To me, both of these hunks look correct (the first one is clean\n> merge, the second one is merge with conflicts).  Ack?\n\nAck!\n\n\n\nm\n"}]}