From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: emacs.git mirror status Date: Fri, 14 Sep 2007 13:51:13 +0200 Message-ID: <86abrpqxce.fsf@lola.quinscape.zz> References: <87y7f9n06z.fsf@rho.meyering.net> <87sl5hmz2t.fsf@rho.meyering.net> <86zlzpr663.fsf@lola.quinscape.zz> <86r6l1qzp1.fsf@lola.quinscape.zz> <86ejh1qxie.fsf@lola.quinscape.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1189770683 26154 80.91.229.12 (14 Sep 2007 11:51:23 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 14 Sep 2007 11:51:23 +0000 (UTC) Cc: Jim Meyering , Emacs development discussions To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 14 13:51:22 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IW9hf-0003d3-Uq for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 13:51:20 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9hf-00063R-7h for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 07:51:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IW9hc-00063M-FL for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:51:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IW9hb-000637-39 for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:51:15 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9ha-000634-UT for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:51:14 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IW9ha-0000TU-CN for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:51:14 -0400 Original-Received: from quinscape.de (dslnet.212-29-44.ip210.dokom.de [212.29.44.210] (may be forged)) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id NAA16128 for ; Fri, 14 Sep 2007 13:51:09 +0200 X-Delivered-To: Original-Received: (qmail 7735 invoked from network); 14 Sep 2007 11:51:13 -0000 Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 14 Sep 2007 11:51:13 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id 777CD8F8ED; Fri, 14 Sep 2007 13:51:13 +0200 (CEST) In-Reply-To: <86ejh1qxie.fsf@lola.quinscape.zz> (David Kastrup's message of "Fri\, 14 Sep 2007 13\:47\:37 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-Detected-Kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:78865 Archived-At: David Kastrup writes: > Andreas Schwab writes: > >> Andreas Schwab writes: >> >>> David Kastrup writes: >>> >>>> Well, if I use something like >>>> >>>> git-gui --blame src/xterm.c >>>> >>>> in the trunk, it is still Miles who indiscriminately gets all the >>>> blame for multi-tty. >>> >>> Ok, the problem is that I didn't match the log message from the big >>> multi-tty merge last May. >> >> Looking closer, this wasn't a merge, but an import. So the history is >> lost, unfortunately. > > For git, the sole difference between a merge and an import is that the > former has the branch as a parent commit. All the other history is > reconstructed by git on the fly rather than tracked. So just > redeclaring the respective CVS checkins (which can be discerned by the > log messages) as merges from the respective branch commit should be > sufficient to let git figure out the corresponding original checkins > in the branch. This should be doable with the git-rewrite-history command using its --parent-filter option. -- David Kastrup