From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 17:04:19 +0100 Message-ID: <87mw4x8vp8.fsf@engster.org> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <83siepiqys.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422806687 17251 80.91.229.3 (1 Feb 2015 16:04:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 16:04:47 +0000 (UTC) Cc: Eli Zaretskii , Dmitry Gutov , emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 17:04:42 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 1YHx0r-0007v5-2R for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 17:04:41 +0100 Original-Received: from localhost ([::1]:50932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx0q-0003Rv-3i for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 11:04:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx0d-0003Rp-GP for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:04:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHx0a-0007hk-9x for emacs-devel@gnu.org; Sun, 01 Feb 2015 11:04:27 -0500 Original-Received: from randomsample.de ([5.45.97.173]:33467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHx0a-0007he-0c; Sun, 01 Feb 2015 11:04:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=H2kEor3I5i4imJgwCeOn7xnJo0kJK5iS9x99Cw7ZvFA=; b=GqUJo6e2BgtwDyBgaxXJNxnCENTscS5dSv5o1TyrCET7Enp6Rzfg82brC3tTXbBourKHZI0BLQN9XSt1+y6CvfVVm09QE4FZl5BGH1I+JMxPW0fFyPgKupndMQXZWjhg; Original-Received: from ip4d149227.dynamic.kabel-deutschland.de ([77.20.146.39] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YHx0Y-0001vV-Md; Sun, 01 Feb 2015 17:04:22 +0100 In-Reply-To: (joakim@verona.se's message of "Sun, 01 Feb 2015 16:52:33 +0100") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:182183 Archived-At: 'joakim' writes: > Eli Zaretskii writes: > >>> Date: Sun, 01 Feb 2015 08:11:24 +0200 >>> From: Dmitry Gutov >>> >>> Given the above, maybe you should revert the merge. Then squash all >>> commits in xwidget into one patch, amend it with proper ChangeLog >>> entries, and then do the merge. >> >> Is it just me, or is someone else bothered by the fact that all the >> first parents now follow Joakim's commits on his feature branch? >> >> Joakim, did you per chance push to master from your branch? > > The thing I thought I did was merging from the feature branch to master, > and then push master. To me, it looks like you merged master into your feature branch, and then pushed it as master. That does not mean that you actually did this, though. My best guess is that you did not merge to master using '--no-ff', which resulted in a fast-forward merge without an explicit merge commit. That's one of those Git "features", you know... > How do I dig myself out of this hole now then? You don't. What's pushed is pushed. :-) -David