From: Pierre Habouzit <madcoder@debian.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Matthias Urlichs <smurf@smurf.noris.de>, git@vger.kernel.org
Subject: Re: git-cvsimport fuzzy commit log matching?
Date: Tue, 23 Dec 2008 12:06:41 +0100 [thread overview]
Message-ID: <20081223110641.GA29481@artemis.corp> (raw)
In-Reply-To: <20081223110302.GA9376@lst.de>
[-- Attachment #1: Type: text/plain, Size: 2186 bytes --]
On Tue, Dec 23, 2008 at 11:03:02AM +0000, Christoph Hellwig wrote:
> 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@sgi.com>
> 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@sgi.com>
> 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@sgi.com>
> 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?
Why not using a fancy git-filterbranch script to squash them together
instead ? It's probably less work than to try to modify your cvs
importer to work the exact way you want.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-12-23 11:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-23 11:03 git-cvsimport fuzzy commit log matching? Christoph Hellwig
2008-12-23 11:06 ` Pierre Habouzit [this message]
2008-12-23 12:53 ` Martin Langhoff
2008-12-23 15:16 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081223110641.GA29481@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=hch@lst.de \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).