From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Wed, 19 Nov 2014 19:39:24 +0300 Message-ID: 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> <83a93n88qe.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416415883 28031 80.91.229.3 (19 Nov 2014 16:51:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 19 Nov 2014 16:51:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 19 17:51:16 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 1Xr8TI-0006c7-RW for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 17:51:12 +0100 Original-Received: from localhost ([::1]:59515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr8TI-0004DC-GJ for ged-emacs-devel@m.gmane.org; Wed, 19 Nov 2014 11:51:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr8SM-0003Ir-VG for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:50:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr8SE-0001r6-Ak for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:50:14 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:56885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr8SE-0001kr-3l for emacs-devel@gnu.org; Wed, 19 Nov 2014 11:50:06 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xr8IV-0007Rc-B0 for emacs-devel@gnu.org; Wed, 19 Nov 2014 17:40:03 +0100 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 19 Nov 2014 17:40:03 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 19 Nov 2014 17:40:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 35 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:177786 Archived-At: Eli Zaretskii writes: >> 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. You still don't get it. No DAG rewriting and we still get to this history while A was made on "branch bar", see my other post. -- Sergey.