[Cvs-cvs] ccvs src/ChangeLog src/client.c ChangeLog NEWS

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/06/19 03:09:23

Modified files:
        src            : ChangeLog client.c 
        .              : ChangeLog NEWS 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3516&r2=1.3517
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.461&r2=1.462
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1352&r2=1.1353
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.371&r2=1.372

Patches:
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3516
retrieving revision 1.3517
diff -u -b -r1.3516 -r1.3517
--- src/ChangeLog       15 Jun 2007 21:19:34 -0000      1.3516
+++ src/ChangeLog       19 Jun 2007 03:09:23 -0000      1.3517
@@ -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: src/client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -b -r1.461 -r1.462
--- src/client.c        19 Dec 2006 04:24:03 -0000      1.461
+++ src/client.c        19 Jun 2007 03:09:23 -0000      1.462
@@ -3336,7 +3336,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')
@@ -3350,7 +3351,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')

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -b -r1.1352 -r1.1353
--- ChangeLog   15 Jun 2007 21:04:58 -0000      1.1352
+++ ChangeLog   19 Jun 2007 03:09:23 -0000      1.1353
@@ -1,3 +1,7 @@
+2007-06-18  Derek Price  <address@hidden>
+
+       * NEWS: Note import now keeps metadata to itself.
+
 2007-06-15  Derek Price  <address@hidden>
 
        * NEWS: Note `cvs import CVS-/CVS' fix.

Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- NEWS        15 Jun 2007 21:04:58 -0000      1.371
+++ NEWS        19 Jun 2007 03:09:23 -0000      1.372
@@ -35,6 +35,8 @@
 
 BUG FIXES
 
+* `cvs import' no longer attempts to send CVS metadata to the server.
+
 * `cvs import' makes more of an effort not to import paths containing files
   and directories named "CVS".