From: Shawn O. Pearce Date: Fri, 15 Jun 2007 03:13:39 GMT Subject: Re: git-p4import.py robustness changes Message-ID: <20070615031338.GB18491@spearce.org> In-Reply-To: <200706142344.29089.simon@lst.de> Simon Hausmann wrote: > On Thursday 14 June 2007 07:35:38 Shawn O. Pearce wrote: > > I do appreciate you taking the time to use filter-branch to try to > > cleanup this history a bit. I really had originally planned on > > pulling your tree through to my fastimport tree and then talking > > Junio into merging with me. But after reading through this history I > > don't want do that, because of the oneline summaries I just pointed > > out above, and because of the missing SBO. ... > I have started cleaning up the history even more by reworking the log messages > of my commits (git-p4-enhanced-logs branch in fast-export, starting at the > last page). Once that is done (I expect that to take a few days) I'll add the > missing SOB lines with git-filter-branch and see if I can get an agreement > from Han-Wen and Marius for doing the same with their commits (adding the > missing lines). OK. > Would you be willing to reevaluate the situation regarding a merge once that's > done? Absolutely. I would like to see the git-p4 work in the main tree, so it is more readily available to users, even though I'm not a p4 user myself. ;-) -- Shawn.