From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 18:45:45 +0200 Message-ID: <83poum4g1y.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458665176 14322 80.91.229.3 (22 Mar 2016 16:46:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 16:46:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 17:46:16 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 1aiPRe-0004Jo-EZ for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 17:46:14 +0100 Original-Received: from localhost ([::1]:38417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPRd-0006xH-Rj for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 12:46:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPRa-0006xC-EG for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:46:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiPRV-0000cC-Eh for emacs-devel@gnu.org; Tue, 22 Mar 2016 12:46:10 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiPRV-0000c2-C4; Tue, 22 Mar 2016 12:46:05 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4183 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aiPRU-0006pR-Kx; Tue, 22 Mar 2016 12:46:05 -0400 In-reply-to: (message from Stefan Monnier on Tue, 22 Mar 2016 12:30:52 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:202078 Archived-At: > From: Stefan Monnier > Date: Tue, 22 Mar 2016 12:30:52 -0400 > > > . 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). Indeed. But sometimes this cannot be avoided, because no matter how quick you are, there's always a chance that someone else pushes between your local commit and your push. The probability of this could be brought down significantly by "git pull" before the local commit, but it cannot be eliminated altogether. > > . 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". You mean, gitmerge-skip-regexp. Yes, I think that's the reason.