[Cvs-cvs] ccvs/src ChangeLog client.c [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <dprice>     07/06/19 02:56:13

Modified files:
        src            : ChangeLog client.c 

Log message:
        * client.c (send_repository): Don't attempt to send metadata from CVS
        subdirectories when importing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.485&r2=1.2336.2.486
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.318.4.44&r2=1.318.4.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.485
retrieving revision 1.2336.2.486
diff -u -b -r1.2336.2.485 -r1.2336.2.486
--- ChangeLog   15 Jun 2007 21:11:10 -0000      1.2336.2.485
+++ ChangeLog   19 Jun 2007 02:56:11 -0000      1.2336.2.486
@@ -1,3 +1,8 @@
+2007-06-18  Derek Price  <address@hidden>
+
+       * client.c (send_repository): Don't attempt to send metadata from CVS
+       subdirectories when importing.
+
 2007-06-15  Derek Price  <address@hidden>
 
        * import.c (import): Check more carefully for files and directories

Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.44
retrieving revision 1.318.4.45
diff -u -b -r1.318.4.44 -r1.318.4.45
--- client.c    26 Jul 2006 07:22:00 -0000      1.318.4.44
+++ client.c    19 Jun 2007 02:56:12 -0000      1.318.4.45
@@ -2783,7 +2783,8 @@
     send_to_server (repos, 0);
     send_to_server ("\012", 1);
 
-    if (supported_request ("Static-directory"))
+    if (strcmp (cvs_cmd_name, "import")
+       && supported_request ("Static-directory"))
     {
        adm_name[0] = '\0';
        if (dir[0] != '\0')
@@ -2797,7 +2798,8 @@
            send_to_server ("Static-directory\012", 0);
        }
     }
-    if (supported_request ("Sticky"))
+    if (strcmp (cvs_cmd_name, "import")
+       && supported_request ("Sticky"))
     {
        FILE *f;
        if (dir[0] == '\0')