From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Wed, 19 Nov 2014 18:18:17 +0200 Message-ID: <83a93n88qe.fsf@gnu.org> References: <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> <20141117141123.GA4294@acm.acm> <83lhn89zxn.fsf@gnu.org> <83bno49xtw.fsf@gnu.org> <20141118224326.GA5167@acm.acm> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416413934 25300 80.91.229.3 (19 Nov 2014 16:18:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 19 Nov 2014 16:18:54 +0000 (UTC) Cc: acm@muc.de, sorganov@gmail.com, emacs-devel@gnu.org To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 19 17:18:46 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xr7xu-0005cc-FA for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 17:18:46 +0100 Original-Received: from localhost ([::1]:59327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr7xu-00045R-23 for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 11:18:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr7xa-000446-Kp for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:18:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr7xV-0006Fn-HV for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:18:26 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:36631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr7xV-0006FB-7j for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:18:21 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NFA00900NJ2DE00@mtaout27.012.net.il> for emacs-devel@gnu.org; Wed, 19 Nov 2014 18:13:42 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFA005JGNQUIW40@mtaout27.012.net.il>; Wed, 19 Nov 2014 18:13:42 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177772 Archived-At: > Date: Wed, 19 Nov 2014 08:12:38 +0700 > From: Yuri Khan > Cc: Sergey Organov , Emacs developers > > On Wed, Nov 19, 2014 at 4:43 AM, Alan Mackenzie wrote: > > > >> Well, given the following history (time goes from left to right): > > > >> - C - D <- foo > >> / > >> ... - A - B > >> \ > >> - E - F <- bar > > > > > >> what branch commit A was made on, 'foo' or 'bar'? > > > > Quite clearly, A was committed on branch foo, since bar didn't exist at > > that time. > > But git does not know that. For all it knows, bar could be the > original branch and foo branched from it at B. The history above is > symmetrical. Bringing DAG rewriting into the picture doesn't help a bit in this already messy discussion. Nothing like that happened in Alan's case, and the chances of its happening in the Emacs repo are slim at best.