From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?SmFuIERqw6Rydg==?= Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Tue, 12 Jan 2010 08:47:02 +0100 Message-ID: <4B4C28F6.9000209@swipnet.se> References: <4B4B93AB.3030903@gnu.org> <87skac1fy7.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: Quoted-Printable X-Trace: ger.gmane.org 1263282786 6671 80.91.229.12 (12 Jan 2010 07:53:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2010 07:53:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?B?w5NzY2FyIEZ1ZW50ZXM=?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 08:52:58 2010 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.50) id 1NUbYg-0004UC-5f for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 08:52:58 +0100 Original-Received: from localhost ([127.0.0.1]:53234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUbYe-0001hC-NB for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 02:52:56 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUbT9-00007M-Jx for emacs-devel@gnu.org; Tue, 12 Jan 2010 02:47:15 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUbT5-00005k-VD for emacs-devel@gnu.org; Tue, 12 Jan 2010 02:47:15 -0500 Original-Received: from [199.232.76.173] (port=54002 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUbT5-00005f-Lk for emacs-devel@gnu.org; Tue, 12 Jan 2010 02:47:11 -0500 Original-Received: from proxy2.bredband.net ([195.54.101.72]:52771) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUbT5-0006eF-7W for emacs-devel@gnu.org; Tue, 12 Jan 2010 02:47:11 -0500 Original-Received: from ipb2.telenor.se (195.54.127.165) by proxy2.bredband.net (7.3.140.3) id 4AD3E1BC024FA74B for emacs-devel@gnu.org; Tue, 12 Jan 2010 08:47:10 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArJFADu4S0tV4S1uPGdsb2JhbACBRIIahFSTGwEBAQE3rEyNUIErgi9WBA X-IronPort-AV: E=Sophos;i="4.49,261,1262559600"; d="scan'208";a="25908242" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 12 Jan 2010 08:47:02 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 56F5B7FA01A; Tue, 12 Jan 2010 08:47:02 +0100 (CET) User-Agent: Thunderbird 2.0.0.23 (X11/20090817) In-Reply-To: <87skac1fy7.fsf@telefonica.net> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:119847 Archived-At: =C3=93scar Fuentes skrev: >=20 > There is something that I disagree with BzrForEmacsDevs: a quickfix tha= t > requires more than one commit or that spans so long in time to warrant = a > merge from upstream does not qualify as a quickfix for me. > This is too simple. There have been many times in the CVS days when I tr= ied=20 to commit a change only to find out there was a conflict (usually ChangeL= og).=20 So I always merge from upstream before committing to upstream. So what= you=20 are saying is in fact, there are no quick fixes. What starts out as a (presumed) quickfix often turns in to a week/month l= ong=20 fix. To assume that one can always beforehand descide if one is about to= do a=20 quickfix or not is also too simple minded. Bzr feels very strange and uncomfortable. It is workable, but not smooth= or=20 elegant, just kind of icky. Jan D.