I'm currently trying to get clean git imports of the XFS userspace repositories. These are funky in the way they were initially kept in ptools, and SGI-internal SCM that was built ontop of RCS which changeset added ontop. So we know that commits actually were done in atomic changesets. But ptools has the "nice" feature of allowing both per-file and per-changeset commits. Due to the per-file commits git-cvsimport often misdetects a single changeset as multiple individual changes, ala: commit 0d47d43b5878c6e7d7b516a793a82f0076d22089 Author: Barry Naujok <bnaujok@xxxxxxx> Date: Mon Jul 16 15:52:53 2007 +0000 Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd. Queue up AGs per thread based on ag stride commit 1fa4685db126fd3071e008a6d18f9d51209ab305 Author: Barry Naujok <bnaujok@xxxxxxx> Date: Mon Jul 16 15:52:53 2007 +0000 Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd. Handle ag stride command line option and setup threads as required commit a73288784e77c2411687f6778adb4c0b0f9dcdff Author: Barry Naujok <bnaujok@xxxxxxx> Date: Mon Jul 16 15:52:53 2007 +0000 Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd. Execute bits changed from x-- to --- Queue up AGs per thread based on ag stride and so on. Any idea how to tell git-cvsimport that if we have exactly the same timestamp, and maybe the same author it really is the same changeset and we want to merge the commit message? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html