From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Tue, 12 Jan 2010 09:40:05 +0100 Message-ID: <87ockz1ztm.fsf@telefonica.net> References: <4B4B93AB.3030903@gnu.org> <87skac1fy7.fsf@telefonica.net> <4B4C28F6.9000209@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1263286376 17012 80.91.229.12 (12 Jan 2010 08:52:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2010 08:52:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 09:52:49 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 1NUcUY-0006Mk-FK for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 09:52:46 +0100 Original-Received: from localhost ([127.0.0.1]:54874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUcUZ-000381-3J for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 03:52:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUcIw-0006bg-DW for emacs-devel@gnu.org; Tue, 12 Jan 2010 03:40:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUcIp-0006Zg-Iv for emacs-devel@gnu.org; Tue, 12 Jan 2010 03:40:45 -0500 Original-Received: from [199.232.76.173] (port=43155 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUcIn-0006ZS-HD for emacs-devel@gnu.org; Tue, 12 Jan 2010 03:40:38 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:37976) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NUcIn-0006vl-4O for emacs-devel@gnu.org; Tue, 12 Jan 2010 03:40:37 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NUcId-0002J0-DP for emacs-devel@gnu.org; Tue, 12 Jan 2010 09:40:27 +0100 Original-Received: from 138.red-83-45-255.dynamicip.rima-tde.net ([83.45.255.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Jan 2010 09:40:27 +0100 Original-Received: from ofv by 138.red-83-45-255.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 12 Jan 2010 09:40:27 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 50 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 138.red-83-45-255.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:TuVFdlcCVJLkCv+MhyPxbzCXsqs= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119853 Archived-At: Jan Djärv writes: > Óscar Fuentes skrev: > >> >> There is something that I disagree with BzrForEmacsDevs: a quickfix that >> 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 > tried to commit a change only to find out there was a conflict > (usually ChangeLog). So I always merge from upstream before committing > to upstream. That's what `bzr up' does on a bound branch or checkout. > So what you are saying is in fact, there are no quick fixes. > > What starts out as a (presumed) quickfix often turns in to a > week/month long fix. To assume that one can always beforehand descide > if one is about to do a quickfix or not is also too simple minded. You can easily turn your quickfixes/ branch into something else: cd quickfixes/ bzr unbind # Make this a regular branch cd .. mv quickfixes/ complex-fix-for-bug342 bzr branch trunk/ quickfixes # Recreate quickfixes/ branch cd quickfixes/ bzr bind URL_TO_UPSTREAM/trunk There are methods for translating the uncommitted changes from one branch to another too, if you prefer to not having to recreate the quickfixes/ branch: bzr branch trunk/ complex-fix-for-bug342 cd complex-fix-for-bug342 bzr merge --uncommitted ../quickfixes cd ../quickfixes bzr revert > Bzr feels very strange and uncomfortable. It is workable, but not > smooth or elegant, just kind of icky. IMO, for the case we are talking about, it works nicely. -- Óscar