From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Jan D." Newsgroups: gmane.emacs.devel Subject: Re: NS compile error after trunk merge r118324 Date: Sun, 9 Nov 2014 22:25:11 +0100 Message-ID: References: <39AB655E-CA13-48E3-8E5C-4B322DCB6F3C@gmail.com> <5h61eo6u3w.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1415568352 5326 80.91.229.3 (9 Nov 2014 21:25:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 9 Nov 2014 21:25:52 +0000 (UTC) Cc: Adrian Robert , "emacs-devel@gnu.org Development" To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 09 22:25:47 2014 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 1XnZzU-0004sq-N9 for ged-emacs-devel@m.gmane.org; Sun, 09 Nov 2014 22:25:44 +0100 Original-Received: from localhost ([::1]:40058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnZzU-0008Fx-9X for ged-emacs-devel@m.gmane.org; Sun, 09 Nov 2014 16:25:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnZz2-00086j-Mt for emacs-devel@gnu.org; Sun, 09 Nov 2014 16:25:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XnZyw-0006DP-SM for emacs-devel@gnu.org; Sun, 09 Nov 2014 16:25:16 -0500 Original-Received: from mailfe09.swip.net ([212.247.155.1]:42359 helo=swip.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnZyw-0006D1-LU; Sun, 09 Nov 2014 16:25:10 -0500 X-T2-Spam-Status: No, hits=0.8 required=5.0 tests=BAYES_50 Original-Received: from hosdjarv.se (account mj138573@tele2.se [46.59.42.57] verified) by mailfe09.swip.net (CommuniGate Pro SMTP 5.4.4) with ESMTPA id 373744738; Sun, 09 Nov 2014 22:25:08 +0100 X-Mailer: iPad Mail (12B410) In-Reply-To: <5h61eo6u3w.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.247.155.1 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:176647 Archived-At: Hi. > 9 nov 2014 kl. 20:40 skrev Glenn Morris : >=20 >=20 > Sorry if I messed that up. There are a lot of merge conflicts these days, > though I don't remember getting one with that change. No problem. I expected problems but not that one. In the 24 branch there is just one scroll function, but in trunk there are t= wo,=20 one for vertical, and one for horizontal. Bzr applied half of the change to= one function and the other half to the other. It did not mark any conflict= . I have only seen this merge behavior in Perforce before, but that is known f= or doing merges badly. Lets just hope Git does better. Jan D.