From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: GNU Emacs is on Bazaar now. Date: Mon, 28 Dec 2009 17:41:56 -0500 Message-ID: <87oclig1qj.fsf@red-bean.com> References: <87d4206n80.fsf@canonical.com> <87637qhjqu.fsf@red-bean.com> <87fx6urat1.fsf@telefonica.net> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262040140 25030 80.91.229.12 (28 Dec 2009 22:42:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Dec 2009 22:42:20 +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 Mon Dec 28 23:42:13 2009 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 1NPOHz-0004Il-HT for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2009 23:42:11 +0100 Original-Received: from localhost ([127.0.0.1]:60457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPOI0-0000Qw-09 for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2009 17:42:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NPOHs-0000Oz-Qd for emacs-devel@gnu.org; Mon, 28 Dec 2009 17:42:04 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NPOHn-0000L7-WD for emacs-devel@gnu.org; Mon, 28 Dec 2009 17:42:04 -0500 Original-Received: from [199.232.76.173] (port=56288 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPOHn-0000L2-Sr for emacs-devel@gnu.org; Mon, 28 Dec 2009 17:41:59 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:58577) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NPOHm-0004CM-W2 for emacs-devel@gnu.org; Mon, 28 Dec 2009 17:41:59 -0500 Original-Received: from localhost ([127.0.0.1]:33935 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NPOHl-0004JT-Ke; Mon, 28 Dec 2009 16:41:57 -0600 In-Reply-To: <87fx6urat1.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Mon, 28 Dec 2009 23:30:34 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) 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:118892 Archived-At: =C3=93scar Fuentes writes: > Andreas Schwab writes: >>> A separate question is, is this a *good* procedure for quick fixes? >> >> Just commit and push them. There is no point in using a special branch. > > It depends on how quick your quickfix is. > > If you start editing the trunk mirror expecting to finish on a few > minutes, but you slowly realize that the issue is not so simple, or some > other urgent task arises ("you broke the build, fix it asap!" etc) you > will have to deal with a polluted gateway to upstream, which is a > inconvenience (move away your "quick" changes, revert modified files, > and later recover the changes. `bzr shelve' can be handy here, but I > don't recommend it to beginners.) This is one reason we recommended the separate 'quickfix' branch -- because you never know when a one-commit quick fix will turn into an N-commit quick fix. > Given the slow commit rate on the Emacs project, I see no problem using > the quickfixes branch on a CVS-like way: bind it to upstream and > > bzr update > > bzr update > > bzr commit -m "fixed bug #2434" > > It is very likely that this works fine with VC. Did you see the part in http://www.emacswiki.org/emacs/BzrForEmacsDevs that says this?: > It might occur to you to save some effort by just doing bzr push > directly to the upstream master from inside the quickfixes branch: >=20 > cd $DEVHOME/emacs/quickfixes > bzr push sftp://@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/ >=20 > *Do not do this* -- it can cause history to be displayed in a strange > way in the upstream master, any mirrors or branches of it, and your own > branch later. Search for the word "hidden" in this mail for more > details. Is that relevant to what you are proposing above? -Karl