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: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Mon, 02 Feb 2015 18:30:35 +0200 Message-ID: <83iofkgtsk.fsf@gnu.org> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> <87y4ohd3d3.fsf@igel.home> <87iofl8vdl.fsf@engster.org> <87twz5d2vr.fsf@igel.home> <87egq98m7w.fsf@engster.org> <54CE80E5.2090205@yandex.ru> <83zj8xh0dr.fsf@gnu.org> <54CE8F97.80209@yandex.ru> <83wq41gfc9.fsf@gnu.org> <87y4og7n9t.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1422894662 29405 80.91.229.3 (2 Feb 2015 16:31:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 16:31:02 +0000 (UTC) Cc: emacs-devel@gnu.org, schwab@linux-m68k.org, joakim@verona.se, dgutov@yandex.ru To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 17:31:01 2015 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 1YIJtr-0000Mq-Lj for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 17:30:59 +0100 Original-Received: from localhost ([::1]:55370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIJtr-0007b1-4h for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 11:30:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIJtm-0007ZS-Gj for emacs-devel@gnu.org; Mon, 02 Feb 2015 11:30:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIJtj-0001eh-0f for emacs-devel@gnu.org; Mon, 02 Feb 2015 11:30:54 -0500 Original-Received: from mtaout28.012.net.il ([80.179.55.184]:41908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIJti-0001e3-Pp for emacs-devel@gnu.org; Mon, 02 Feb 2015 11:30:50 -0500 Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il (HyperSendmail v2007.08) id <0NJ500L00KDLNY00@mtaout28.012.net.il> for emacs-devel@gnu.org; Mon, 02 Feb 2015 18:29:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NJ500BEOKGCJV90@mtaout28.012.net.il>; Mon, 02 Feb 2015 18:29:00 +0200 (IST) In-reply-to: <87y4og7n9t.fsf@engster.org> 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.184 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:182266 Archived-At: > From: David Engster > Cc: Dmitry Gutov , schwab@linux-m68k.org, joakim@verona.se, emacs-devel@gnu.org > Date: Mon, 02 Feb 2015 09:03:58 +0100 > > >> On 02/01/2015 09:56 PM, Eli Zaretskii wrote: > >> > >> > When did you last look at "git log --graph"? > >> > >> My preferred alias for 'git log' contains the '--graph' argument, but I > >> haven't pulled the new changes yet. > > > > It didn't start yesterday. > > I think we can at least partly fix this by simply doing what Joakim did, > but the other way round. We create a branch from the last proper > mainline commit Joakim merged into his branch (a2c32b0cfc) When I said "didn't start yesterday", I meant Joakim wasn't the first one to introduce such merges into the repository. I see several more merge-commits with parents in reverse order, if I look far enough back. > - git checkout -b dagfix a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e > > - git merge --no-ff master > > - git checkout master > > - git merge dagfix > > Opinions? That will only fix the last instance of such merges. But maybe we don't care.