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: [Emacs-diffs] /srv/bzr/emacs/trunk r109327: Generalize INTERNAL_FIELD between buffers, keyboards and frames. Date: Fri, 03 Aug 2012 09:27:46 +0300 Message-ID: <834nokcwwt.fsf@gnu.org> References: <50191B54.2070705@yandex.ru> <5019FE2D.2060005@yandex.ru> <87a9ydbzwf.fsf@uwakimon.sk.tsukuba.ac.jp> <83ehnpcn7d.fsf@gnu.org> <501AF10B.6090901@cs.ucla.edu> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1343975285 15873 80.91.229.3 (3 Aug 2012 06:28:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Aug 2012 06:28:05 +0000 (UTC) Cc: stephen@xemacs.org, dmantipov@yandex.ru, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 03 08:28:05 2012 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 1SxBMh-0003BM-52 for ged-emacs-devel@m.gmane.org; Fri, 03 Aug 2012 08:28:03 +0200 Original-Received: from localhost ([::1]:35890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxBMg-0006K5-5i for ged-emacs-devel@m.gmane.org; Fri, 03 Aug 2012 02:28:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxBMb-0006Jh-B5 for emacs-devel@gnu.org; Fri, 03 Aug 2012 02:27:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxBMY-0005vb-65 for emacs-devel@gnu.org; Fri, 03 Aug 2012 02:27:57 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:39199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxBMX-0005vR-Tz for emacs-devel@gnu.org; Fri, 03 Aug 2012 02:27:54 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0M8600I001YGEL00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 03 Aug 2012 09:27:52 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M8600IM91YF4OB0@a-mtaout21.012.net.il>; Fri, 03 Aug 2012 09:27:52 +0300 (IDT) In-reply-to: <501AF10B.6090901@cs.ucla.edu> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 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:152134 Archived-At: > Date: Thu, 02 Aug 2012 14:28:43 -0700 > From: Paul Eggert > CC: "Stephen J. Turnbull" , dmantipov@yandex.ru, > monnier@IRO.UMontreal.CA, emacs-devel@gnu.org > > On 08/02/2012 08:45 AM, Eli Zaretskii wrote: > > the same is > > probably true for GC-related work: it mainly affects alloc.c > > I'm afraid not. Dmitry is right: GC affects lots of files, > basically, anything that touches a data structure that might > be garbage-collected. > > My experience with merging is closer to Dmitry's, I'm afraid. > It's no fun merging, say, the FVAR/WVAR/etc patches with the > inline-function patches that I have pending for post-24.2 > . Mega changes such as FVAR/WVAR/etc should be treated as outliers in this statistics. (One more reason to avoid them if at all possible, btw.) > It's not that it can't be done -- of course it can -- but it's > tedious and error-prone. The FVAR/etc patches and the inline > patches are both pervasive, and so have many opportunities > to collide with each other. Again, let's not build card towers from a single extreme case. Anyway, I gave numbers for my experience. It would be good to see yours, or someone else's. It's all there in your ~/.bzr.log file, so just grep it and tell how many conflicts you had in your merges, and not just for the last FVAR/etc incident.