From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 11 Nov 2010 12:43:27 +0000 (-0500)
Subject: A step forward.
X-Git-Tag: 0.1~65
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=5466cb4817f7bc3a0500075dbf6311a99afe76cd;p=rcs-fast-import.git

A step forward.
---

diff --git a/rcs-fast-import b/rcs-fast-import
index 238fe12..8466e9b 100755
--- a/rcs-fast-import
+++ b/rcs-fast-import
@@ -558,7 +558,6 @@ class RCS:
                 announce("ignoring a submodule link %s", path)
                 continue
             else:
-                inargs.append(RCS.master(path))
                 rcsdir = os.path.join(os.path.dirname(path), "RCS")
                 if not os.path.exists(rcsdir):
                     try:
@@ -569,16 +568,20 @@ class RCS:
                     announce("copying %s to %s" % (os.path.relpath(copyfile), path))
                 if not dryrun:
                     shutil.copy(copyfile, path)
-        responsible = event.authors[0] or event.committer
-        command = "ci -l"
-        # If we were going to try to match committer or author
-        # email addresses to local names, this would be the place
-        # to do it.  Not a whole lot of point in trying, though.
-        #command += " -w%s" % responsible.email
-        command += " -d'%s'" % responsible.date.rfc822()
-        command += " -m%s" % `event.comment`
-        command += " " + " ".join(inargs)
-        do_or_die(command, "checkin")
+                inargs.append(path)
+                inargs.append(RCS.master(path))
+                responsible = event.authors[0] or event.committer
+                quotified = ""
+                state = 0
+                command = "ci -l"
+                # If we were going to try to match committer or author
+                # email addresses to local names, this would be the place
+                # to do it.  Not a whole lot of point in trying, though.
+                #command += " -w%s" % responsible.email
+                command += " -d'%s'" % responsible.date.rfc822()
+                command += " -m%s" % `event.comment`
+                command += " " + " ".join(inargs)
+                do_or_die(command, "checkin")
     def rename(self, source, target):
         "Perform RCS renames."
         # Dodgy, but since user is more likely to be