From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 11:22:00 +0100 Message-ID: <56F11CC8.4000406@gmx.at> 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> <56EFBD68.1050307@gmx.at> <56F0358F.7000103@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458642167 16166 80.91.229.3 (22 Mar 2016 10:22:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 10:22:47 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 11:22:37 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 1aiJSN-0003kI-38 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 11:22:35 +0100 Original-Received: from localhost ([::1]:34870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJSM-0004RJ-CW for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 06:22:34 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJSI-0004RD-Cp for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:22:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiJSD-0003dj-Kj for emacs-devel@gnu.org; Tue, 22 Mar 2016 06:22:30 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:58458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiJSD-0003dB-B3; Tue, 22 Mar 2016 06:22:25 -0400 Original-Received: from [192.168.1.100] ([212.95.7.15]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0Lzc5y-1Zf5kY328I-014mta; Tue, 22 Mar 2016 11:22:08 +0100 In-Reply-To: <56F0358F.7000103@cs.ucla.edu> X-Provags-ID: V03:K0:OkrQejUg1rd6sTemANJyGYm/H7NtApocu4FgNQz9D4BFaWA9q6N pHMTD6rbf/dYkjbPTa46Y7EPBO0OtMRZlii2B74FznxoiQY5IFtW2wJVeYPcKozdzC2ZhCm wRD4WbOBB2aRULJmg4oUAXDc8Woz+ObEqRqgB0i/zF/F7Wg2NGmpNY9RXuzVgKoioNrOdiX JedYYGbTwRcdUmgPEZROg== X-UI-Out-Filterresults: notjunk:1;V01:K0:AuaBhxF7InY=:pKv1cqZfT6zYVglkKpo6dl rf71PNHZi+R8sZZ85tJrm88Eh7DCw45fwgDG9lYnm8ohwyU/OEG59P8hgbaYJTSV9lwrk7Hms W4tX3msagosbZhkhHncAzs4D49FrdFLm972c4BQ8p9qgA0qauH4aRTCvw3dnKlxO/wQ0AV2di fpczCK4pq0JIfAxl/vPnjHHBnG3iYfLwHBsY2EmmE3CQ5U2YURFgZ6Wkh6uQWRnEqn94tkHWR yz7hCm2JWAS81uM+Wtx4DWebo8i0hBPXGFIuLrgCWDlI90ke/frxnPNfEzRIxe9/SzBy50JU2 NGuohWIPd391CybpAKeNW3rYbz+NX3YfL2+ElIhNm6+bnux06FnyC9ezGwHt28Gu2Gsq28evQ UEP1r/naowqJYjCGTx5cm4VUPTh7Sln0t7GEiah3DNGmj0SPgHZ9XOJew5/tDxwLiXGdX/11/ F0+z1QwBdD0fD4Xg7xXsF4klE53l4HUXbkIdzR30C20vHIBkIdIhCt2wc/7QYdGqZbdPmVX6j 5YQwdWQ5amU329Gy5x8PwMtfH3BJrVgpD2+HY8Inoj42Yd4u8m5TE1guN8b19Zhj/x3+vUyCg 8IMvcplechPlPPixSrBM5pBFrK6O3x5EV0vfVECJcWFgTwAQ+h0s081DzT3eSqm3uRgYRIK6H zhsFgUlRd/OgE9ajwgTnz9ru4XIzX3XshJYGkTT0geDzS4zp7usJpla7AztuZrJlNoW45AAjy X5HVXOptrBezJpnUCVriDy6ai4lQbq4XphYKRJW6rhKMun4WDCCn2nm2PriURAA2pHhZPWsp X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.18 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:202058 Archived-At: > You might try gitk. It's not perfect, but it beats 'git log' for this > sort of thing. I'm probably too silly but neither with gitk I can visualize the commit that did reset m->total_cols = new_size; to m->total_cols = size; > > One thing that stupefies me is that in >> >> commit fbce4757a874cc43806eb41b8637538b101c3c69 >> Author: Alan Mackenzie >> Date: Sun Jan 24 20:30:39 2016 +0000 >> >> which IIUC follows the commits you cited above, the "correct" version is >> still there why it should have been already lost at least on January 20. > > That patch was applied after the problematic merge > e6d575316a42946aac6d83c9587f09afd1a59d98 that propagated the problems > I identified in my previous email, so it is immune to those problems. > > Specifically, the problematic merge combined > fef1b3066ae02ec6dd37b0358905491fabbedfdf (which did not have the > problem) and 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa (which did have > the problem), whereas the commit you cite is an immediate child of > fef1b3066ae02ec6dd37b0358905491fabbedfdf and was therefore applied in > the next merge (cb4e054e41cdb7e398351a5ae8224759e721349e). I'm still lost. (1) I do C-x v l in master's window.c. (2) I go to the fragment commit fbce4757a874cc43806eb41b8637538b101c3c69 Author: Alan Mackenzie Date: Sun Jan 24 20:30:39 2016 +0000 and on the commit line I type 'f' which gets me a buffer called window.c.~fbce4757a874cc43806eb41b8637538b101c3c69~. Line 4079 of that buffer shows m->total_cols = new_size; Now IIUC this means that this line "was in master once". Or am I wrong? (3) Now I go to the fragment commit 82b089783e71b2aeef950eaecfe4cbc0735e64a2 Merge: d27c807 f7dc6d8 Author: Paul Eggert Date: Sat Jan 30 11:27:34 2016 -0800 and on the commit line I type 'f' which gets me a buffer called window.c.~82b089783e71b2aeef950eaecfe4cbc0735e64a2~. Line 4079 of that buffer shows me m->total_cols = size; Since as you said 82b089783e71b2aeef950eaecfe4cbc0735e64a2 is not the offending commit there must have been a commit (on master) in between the commits I cited above that did reset line 4079. If so, how do I find that offending commit? Apparently "git log src/window.c" won't find it which IIUC renders this command useless for tracking merges. Neither do git show 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa git show cb4e054e41cdb7e398351a5ae8224759e721349e show any changes to window.c. And git show 7823745acbe9b87eea2db4ef434e379fc903ec35 which you cited earlier as the culprit only tells me that commit 7823745acbe9b87eea2db4ef434e379fc903ec35 Merge: 6acd2aa bb0cd31 Author: John Wiegley Date: Mon Jan 18 22:56:33 2016 -0800 ; Merge from origin/emacs-25 The following commit was skipped: bb0cd31 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 So was that line that in (2) above apparently "was in master once" removed silently? martin