From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Mon, 2 Feb 2015 11:53:09 +0100 Message-ID: <21711.22293.636826.987232@a1i15.kph.uni-mainz.de> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1422874432 5113 80.91.229.3 (2 Feb 2015 10:53:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 10:53:52 +0000 (UTC) Cc: Eli Zaretskii , Dmitry Gutov , schwab@linux-m68k.org, joakim@verona.se, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 11:53:51 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 1YIEdW-0001eU-FI for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 11:53:46 +0100 Original-Received: from localhost ([::1]:53895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEdV-0001rQ-Jl for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 05:53:45 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEdF-0001rC-FN for emacs-devel@gnu.org; Mon, 02 Feb 2015 05:53:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIEdE-0006gN-QJ for emacs-devel@gnu.org; Mon, 02 Feb 2015 05:53:29 -0500 Original-Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:42032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIEdB-0006e7-3e; Mon, 02 Feb 2015 05:53:25 -0500 Original-Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id t12ArBXx027464; Mon, 2 Feb 2015 11:53:11 +0100 Original-Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id t12ArAZB031863; Mon, 2 Feb 2015 11:53:10 +0100 Original-Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id t12Ar9g7031857; Mon, 2 Feb 2015 11:53:09 +0100 In-Reply-To: <87y4og7n9t.fsf@engster.org> X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 134.93.134.1 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:182243 Archived-At: >>>>> On Mon, 02 Feb 2015, David Engster wrote: > 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), do a no-ff > merge of master into it and then do a fast-forward merge back: > - git checkout -b dagfix a2c32b0cfc9f6d3410e2832d8ea0d4f1df576d1e > - git merge --no-ff master > - git checkout master > - git merge dagfix > Opinions? That's probably the best what can be done without rewriting the history. It should be done soon, though. Ulrich