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:40:07 +0200 Message-ID: <86ir6dqxuw.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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1189770068 24114 80.91.229.12 (14 Sep 2007 11:41:08 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 14 Sep 2007 11:41:08 +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:41:06 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 1IW9Xd-0000ih-LJ for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 13:40:57 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9Xd-0000EG-5E for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 07:40:57 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IW9Ww-0007mv-FM for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:40:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IW9Ws-0007fj-33 for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:40:12 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9Wr-0007fM-OJ for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:40:09 -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 1IW9Wr-0006ep-6A for emacs-devel@gnu.org; Fri, 14 Sep 2007 07:40:09 -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 NAA15813 for ; Fri, 14 Sep 2007 13:40:04 +0200 X-Delivered-To: Original-Received: (qmail 7081 invoked from network); 14 Sep 2007 11:40:07 -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:40:07 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id C23D58F8ED; Fri, 14 Sep 2007 13:40:07 +0200 (CEST) In-Reply-To: (Andreas Schwab's message of "Fri\, 14 Sep 2007 13\:32\:07 +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:78863 Archived-At: 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. I'll see what I can do, I'll probably have to > recreate the whole tree. Well, it would minimally probably mean that one takes a look at "merge change from branch" commit messages and then merge the changes with a strategy of "ours": ours This resolves any number of heads, but the result of the merge is always the current branch head. It is meant to be used to supersede old development history of side branches. Something like that. -- David Kastrup