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: VC and bzr. Date: Thu, 22 Apr 2010 23:54:28 +0300 Message-ID: <8339yn4397.fsf@gnu.org> References: <4BCF45FA.1060808@swipnet.se> <4BCFDE02.5090808@swipnet.se> <4BD01AC9.1000200@swipnet.se> <4BD0395F.7040500@swipnet.se> <87eii7629z.fsf@telefonica.net> <87aasv5zsz.fsf@telefonica.net> <87633j5ya8.fsf@telefonica.net> <871ve75t1e.fsf@telefonica.net> <83633j48mi.fsf@gnu.org> <87sk6n4733.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1271969723 19259 80.91.229.12 (22 Apr 2010 20:55:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 20:55:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 22:55:22 2010 connect(): No such file or directory Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O53Qc-0003ae-Qf for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 22:55:19 +0200 Original-Received: from localhost ([127.0.0.1]:33377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O53Qb-0008J3-Ni for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 16:55:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O53QW-0008Ih-Pl for emacs-devel@gnu.org; Thu, 22 Apr 2010 16:55:12 -0400 Original-Received: from [140.186.70.92] (port=60921 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O53QV-0008IT-M9 for emacs-devel@gnu.org; Thu, 22 Apr 2010 16:55:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O53QU-0006TF-1v for emacs-devel@gnu.org; Thu, 22 Apr 2010 16:55:11 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:33138) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O53QT-0006T0-RN for emacs-devel@gnu.org; Thu, 22 Apr 2010 16:55:10 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L1A00300PX5NB00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Thu, 22 Apr 2010 23:54:27 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.129.222]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L1A001Q2Q2Q0CA0@a-mtaout23.012.net.il>; Thu, 22 Apr 2010 23:54:27 +0300 (IDT) In-reply-to: <87sk6n4733.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:124083 Archived-At: > From: =C3=93scar Fuentes > Date: Thu, 22 Apr 2010 21:31:44 +0200 >=20 > Merging from trunk into a feature branch is not a serious problem (= it > creates some noise on the history with the associated slowdown on b= zr's > responsiveness, but that's all). But pushing to trunk after merging= is a > serious problem as you (Eli) discovered: This is a misunderstanding. No one was suggesting such a workflow. The suggestion was to commit locally more, and commit remotely less. Which in practice means to work on a local branch, then merge back to trunk when the changes are ready. To avoid clutter in the history log, I further suggested not to merge from mainline as long as one works on a single feature in a local branch. I find these merges necessary only when I work for months on some very invasive feature. > The solution for the annoying slowness of commit operations is the = smart > server I'm not sure I will be alive, or around, long enough to see it happen= . It is ridiculous that it took me less time to develop bidirectional display than it takes Savannah hackers to set up a server. Perhaps I'm too stupid to understand how this is possible.