From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 17:00:49 +0000 Message-ID: <874mbyjvlq.fsf@russet.org.uk> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458666128 30384 80.91.229.3 (22 Mar 2016 17:02:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 17:02:08 +0000 (UTC) Cc: rudalics@gmx.at, John Wiegley , emacs-devel@gnu.org, eggert@cs.ucla.edu To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 18:01:59 2016 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 1aiPgs-0006o9-3R for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 18:01:58 +0100 Original-Received: from localhost ([::1]:38483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPgr-0007gU-FL for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 13:01:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPgj-0007fr-Pp for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:01:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPge-0005EG-8K for emacs-devel@gnu.org; Tue, 22 Mar 2016 13:01:49 -0400 Original-Received: from cloud103.planethippo.com ([31.216.48.48]:44320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPgY-00055R-Dr; Tue, 22 Mar 2016 13:01:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=Y4vChrhpfDIKxTS4Hv7epRZ78iedppp2NAGYh9aN5t4=; b=eivwOWKbXHdYEz4rTifvSj5EZd PoNsnHDTsfGwxoXyNQvVbTSCHNB5MCRD75BYD3jsSTkRM9vvtnorVZgG/kUeH6IkgNEI7/sz2kqJi M2LllUA4zvTNInJj1kMGpbUdl1zzXAG+ptbjWVm3e1TC7GSiIfmHShC+xnO7u5DN8FRuruWKl7lp3 TlmS6VCqniC1RfxyJuLkdh8Hf1dQ+wAQabedY4pEiodRrCjtbEePQfHlJZhSVh1N6C+tEnm5C8Y+x MUtVme6/3u9OCqYYeHd4PWPC+yTNNhaEFIur/7VOR5AvxrNNbZNaRbun7EVclPmv28c8xqEqw6+dG 9kPLsaXw==; Original-Received: from janus-nat-128-240-225-60.ncl.ac.uk ([128.240.225.60]:56341 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1aiPfm-002TUZ-2W; Tue, 22 Mar 2016 17:00:50 +0000 In-Reply-To: <83wpou4hb4.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Mar 2016 18:18:39 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 31.216.48.48 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:202080 Archived-At: Eli Zaretskii writes: >> But in these cases, the commit we lost should have been mentioned in >> the list of skipped one. It wasn't, AFAICS. > > I think I know what happened. It goes like this: > > . Phillip worked on test selector for the test suite. When he > finished, he made a local commit 549a765 on the emacs-25 branch. > > . Phillip then said "git pull", followed by "git push". This > produced the merge-commit bb0cd31, which incorporated 9 other > commits that were pushed there since the time Phillip started > working on 549a765. One of these 9 commits was my commit that > fixed resize_frame_windows. Oh dear, should have made those changes on a branch and rebased from emacs-25. Phil