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: Thu, 02 Aug 2012 18:45:10 +0300 Message-ID: <83ehnpcn7d.fsf@gnu.org> References: <50191B54.2070705@yandex.ru> <5019FE2D.2060005@yandex.ru> <87a9ydbzwf.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1343922336 24290 80.91.229.3 (2 Aug 2012 15:45:36 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 2 Aug 2012 15:45:36 +0000 (UTC) Cc: dmantipov@yandex.ru, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 02 17:45:35 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 1Swxag-0005fE-89 for ged-emacs-devel@m.gmane.org; Thu, 02 Aug 2012 17:45:34 +0200 Original-Received: from localhost ([::1]:35228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swxaf-0004vU-6i for ged-emacs-devel@m.gmane.org; Thu, 02 Aug 2012 11:45:33 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwxaX-0004uC-7E for emacs-devel@gnu.org; Thu, 02 Aug 2012 11:45:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwxaR-0003zq-Tq for emacs-devel@gnu.org; Thu, 02 Aug 2012 11:45:25 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:58078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwxaR-0003ze-LD for emacs-devel@gnu.org; Thu, 02 Aug 2012 11:45:19 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0M8400400WVCDN00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Thu, 02 Aug 2012 18:45:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M84004Z3X3HC720@a-mtaout20.012.net.il>; Thu, 02 Aug 2012 18:45:17 +0300 (IDT) In-reply-to: <87a9ydbzwf.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.166 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:152119 Archived-At: > From: "Stephen J. Turnbull" > Date: Thu, 02 Aug 2012 14:56:16 +0900 > Cc: Stefan Monnier , emacs-devel@gnu.org > > For you personally, why don't you talk to Miles (aka Mr. Lexbind) and > Eli (aka Mr. BIDI) and see if they have some hints for maintaining > one's own enthusiasm for working on a long-lived branch? My experience with this is that merging is not a problem at all. I just grepp'ed my .bzr.log files for the 2 years I developed bidi on a branch, and found only 11 conflicts there. Given that I was merging from the trunk once a week, this number is all but negligible. To be fair, I was mainly hacking a single source file (and another one that didn't exist on the trunk, so it doesn't count). But the same is probably true for GC-related work: it mainly affects alloc.c, and that's it. So, all in all, I don't understand what's all the fuss about merging nightmare. For me, one of the main advantages of bzr (which is common to all modern dVCSes) is the much smarter merging, with the result that conflicts are almost non-existent. I used to be petrified by merges and branches when I used CVS; now I don't think twice when I need to make a branch and work on it for a while. Just try it.