From ea48643dcf6720d0e85c690a0bc85845de6039f8 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 11 Nov 2010 08:28:45 -0500 Subject: [PATCH] This looks like we get correct checkins. --- rcs-fast-import | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rcs-fast-import b/rcs-fast-import index 4711735..ea34859 100755 --- a/rcs-fast-import +++ b/rcs-fast-import @@ -552,7 +552,6 @@ class RCS: return os.path.join(*parts) def commit(self, event, committables): "Perform RCS file checkins and modifications," - inargs = [] for (path, mode, copyfile) in committables: if mode == "160000": announce("ignoring a submodule link %s", path) @@ -568,8 +567,6 @@ class RCS: announce("copying %s to %s" % (os.path.relpath(copyfile), path)) if not dryrun: shutil.copy(copyfile, path) - inargs.append(path) - inargs.append(RCS.master(path)) responsible = event.authors[0] or event.committer command = "ci -l" # If we were going to try to match committer or author @@ -578,8 +575,12 @@ class RCS: #command += " -w%s" % responsible.email command += " -d'%s'" % responsible.date.rfc822() command += ' -m"%s"' % event.comment.replace('"', '\\"') - command += " " + " ".join(inargs) + command += " " + path + " " + RCS.master(path) do_or_die(command, "checkin") + if verbose >= DEBUG_SHUFFLE: + announce("removing %s" % (path,)) + if not dryrun: + os.remove(path) def rename(self, source, target): "Perform RCS renames." # Dodgy, but since user is more likely to be -- 2.43.0