From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 12:30:52 -0400 Message-ID: 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 1458664284 31574 80.91.229.3 (22 Mar 2016 16:31:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 16:31:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 17:31:15 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 1aiPD8-0002qW-9r for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 17:31:14 +0100 Original-Received: from localhost ([::1]:38320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPD7-0003l2-M6 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 12:31:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPD0-0003ka-6y for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:31:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPCw-0004BF-AO for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:31:06 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:36425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPCw-0004B1-3X for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:31:02 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1aiPCu-0002hB-4m for emacs-devel@gnu.org; Tue, 22 Mar 2016 17:31:00 +0100 Original-Received: from 69-196-182-150.dsl.teksavvy.com ([69.196.182.150]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 17:31:00 +0100 Original-Received: from monnier by 69-196-182-150.dsl.teksavvy.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 22 Mar 2016 17:31:00 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 69-196-182-150.dsl.teksavvy.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) Cancel-Lock: sha1:2w7hJ4xtnMjH28v5TmpxnEQmzSg= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:202076 Archived-At: > I think I know what happened. It goes like this: Sounds like a good explanation, thank you. > . Phillip then said "git pull", followed by "git push". That's a problem in itself, since it leads to annoying commit diffs that repeat other things, and it changes "git log" ordering in confusing ways (makes it seem like mainline's development is Philip's and when happened on master during this time was done on a branch). > . When John merged all of that to master, bb0cd31 was skipped. > Skipping it omitted all the 9 commits that were merged by bb0cd31. > So the question (to John) now becomes: why was bb0cd31 skipped? Probably because it's a merge commit, so its commit message contains "merge" which is in bzrmerge-skip-regexp. We should probably remove "merge" from bzrmerge-skip-regexp (and use "backport" as the main magic keyword) or at least refine it to only match things like "don't merge". Stefan