]> thyrsus.com Git - sccs2rcs.git/commitdiff
Minor bug fixes.
authorEric S. Raymond <esr@thyrsus.com>
Fri, 13 Jul 2007 14:02:57 +0000 (14:02 +0000)
committerEric S. Raymond <esr@thyrsus.com>
Fri, 13 Jul 2007 14:02:57 +0000 (14:02 +0000)
sccs2rcs

index 9994bf345f5e76ee73fbb6d8c816c699d8239edd..0113bcc252b3b7d7b45cbc05e2b58b1ddc07ac74 100755 (executable)
--- a/sccs2rcs
+++ b/sccs2rcs
@@ -298,6 +298,8 @@ if __name__ == '__main__':
                     deltalines.pop(0)
                     if deltalines[0].startswith("COMMENTS"):
                         break
+                while not deltalines.strip():
+                    deltalines.pop(0)
                 deltamsg = deltalines.join("\n")
                 cmd = 'ci -f -r%s -d"%s" -w%s %s' % (rev, date, author, stem)
                 # FIXME: output of this command isn't logged
@@ -309,7 +311,7 @@ if __name__ == '__main__':
                 except OSError:
                     die("RCS checkin of delta failed")
         # We're done
-       logtext += get_output_or_die("unget " + sccsmaster(stem))
+       get_output_or_die("unget " + sccsmaster(stem))
 
     # Replace all files for which there exist SCCS masters,
     progress("replacing workfiles...")