Module Name:    src
Committed By:   christos
Date:           Sun Feb 21 00:56:44 UTC 2016

Modified Files:
        src/external/gpl2/xcvs/dist/src: import.c

Log Message:
Handle the last newline in the "special" import for new file like RCS does.
I.e. make_message_rcsvalid() removes it, and we put it back.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/import.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.4 src/external/gpl2/xcvs/dist/src/import.c:1.5
--- src/external/gpl2/xcvs/dist/src/import.c:1.4	Sat Jan 30 11:21:47 2016
+++ src/external/gpl2/xcvs/dist/src/import.c	Sat Feb 20 19:56:44 2016
@@ -1407,7 +1407,7 @@ add_rcs_file (const char *message, const
 	    /* We are going to put the log message in the revision on the
 	       branch.  So putting it here too seems kind of redundant, I
 	       guess (and that is what CVS has always done, anyway).  */
-	    if (fprintf (fprcs, "Initial revision\012") < 0)
+	    if (fprintf (fprcs, "Initial revision") < 0)
 		goto write_error;
 	}
 	else
@@ -1415,7 +1415,7 @@ add_rcs_file (const char *message, const
 	    if (expand_at_signs (message, (off_t) strlen (message), fprcs) < 0)
 		goto write_error;
 	}
-	if (fprintf (fprcs, "@\012") < 0 ||
+	if (fprintf (fprcs, "\012@\012") < 0 ||
 	    fprintf (fprcs, "text\012@") < 0)
 	{
 	    goto write_error;
@@ -1441,7 +1441,7 @@ add_rcs_file (const char *message, const
 		fprintf (fprcs, "log\012@") < 0 ||
 		expand_at_signs (message,
 				 (off_t) strlen (message), fprcs) < 0 ||
-		fprintf (fprcs, "@\012text\012") < 0 ||
+		fprintf (fprcs, "\012@\012text\012") < 0 ||
 		fprintf (fprcs, "@@\012") < 0)
 		goto write_error;
 	}

Reply via email to