From: Martin Langhoff Date: Tue, 23 Dec 2008 12:53:42 GMT Subject: Re: git-cvsimport fuzzy commit log matching? Message-ID: <46a038f90812230453m4122e018l2cc22be3f40ab630@mail.gmail.com> In-Reply-To: <20081223110302.GA9376@lst.de> On Tue, Dec 23, 2008 at 9:03 AM, Christoph Hellwig wrote: > 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? Right now, cvsimport relies on cvsps for this. cvsps compares author, timestamp (with a fuzz factor 'cause cvs commits over slow networks or hosts can span minutes - you could dial down to 0, it's the -z flag) *and* commit msg. What you could do is 1 - run cvsps with export to a file (I've posted in this list how to run it exactly as cvsimport does) 2 - post-process cvsps ouput with perl (there's a parser already in cvsimport ;-) ) 3 - run cvsimport with the post-processed file Or postprocess the imported git tree as others have suggested. hth, martin -- martin.langhoff@gmail.com martin@laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff