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: Sat, 26 Mar 2016 17:34:03 -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> <83oaa30wjs.fsf@gnu.org> <87vb4azznm.fsf@engster.org> <83egay25nj.fsf@gnu.org> <87r3eyzt20.fsf@engster.org> <83a8lm1w5s.fsf@gnu.org> <87d1qi5yz6.fsf@engster.org> <8360wa1myk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459028082 19997 80.91.229.3 (26 Mar 2016 21:34:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 26 Mar 2016 21:34:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 26 22:34:28 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 1ajvql-0004WH-Rj for ged-emacs-devel@m.gmane.org; Sat, 26 Mar 2016 22:34:27 +0100 Original-Received: from localhost ([::1]:33539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajvqh-0001ev-Bz for ged-emacs-devel@m.gmane.org; Sat, 26 Mar 2016 17:34:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajvqd-0001ec-9h for emacs-devel@gnu.org; Sat, 26 Mar 2016 17:34:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajvqa-0006OU-4j for emacs-devel@gnu.org; Sat, 26 Mar 2016 17:34:19 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajvqZ-0006OP-U8 for emacs-devel@gnu.org; Sat, 26 Mar 2016 17:34:16 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ajvqT-0004Pp-PQ for emacs-devel@gnu.org; Sat, 26 Mar 2016 22:34:09 +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 ; Sat, 26 Mar 2016 22:34:09 +0100 Original-Received: from monnier by 69-196-182-150.dsl.teksavvy.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 26 Mar 2016 22:34:09 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 10 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:ikiT8CnGwyHdZ4Xa962o/DQDdSQ= 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:202266 Archived-At: > So I guess the fact that a commit was skipped during a merge is > something that is so hard to see that perhaps the entire issue of > skipping is moot with Git, and we shouldn't be bothered by it. Skipping is not something really relevant from the history point of view. It's rather relevant for the one performing a merge since the main purpose to avoid spurious conflicts. Stefan