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: Installing changes from branches Date: Sat, 03 Apr 2010 18:08:04 +0300 Message-ID: <83fx3c1smj.fsf@gnu.org> References: <87bpe1z57e.fsf@telefonica.net> <8339zdvwqj.fsf@gnu.org> <877hoozkic.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 1270307377 21955 80.91.229.12 (3 Apr 2010 15:09:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 15:09:37 +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 Sat Apr 03 17:09:33 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.69) (envelope-from ) id 1Ny4yY-0002q7-Tb for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 17:09:31 +0200 Original-Received: from localhost ([127.0.0.1]:38713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny4yY-0006cN-9K for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 11:09:30 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny4xD-0006DB-9Q for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:08:07 -0400 Original-Received: from [140.186.70.92] (port=35157 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny4xB-0006Ct-IZ for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:08:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny4x9-0008MN-Mp for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:08:05 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:37436) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny4x9-0008MB-Dj for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:08:03 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0L0B00E0035CCM00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 03 Apr 2010 18:08:01 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.92.42]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L0B00E8W3DCHH00@a-mtaout20.012.net.il>; Sat, 03 Apr 2010 18:08:01 +0300 (IDT) In-reply-to: <877hoozkic.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:123125 Archived-At: > From: =C3=93scar Fuentes > Date: Sat, 03 Apr 2010 16:19:23 +0200 >=20 > For instance, if you begin hacking into something that seems easy b= ut > later discover that it is a deeper issue, turning `quickfixes' into= a > feature branch is trivial. How is that trivial? It's a bound branch under your suggestion. "bz= r unbind" is not exactly a common command, and the wiki warns: "Unbinding has some unintuitive consequences; be careful." Or did you mean something else? > If you were working on `trunk' you'll need to > create a feature branch and merge `trunk's uncommitted changes into= it, > which may be tricky on some cases, as if you have new unregistered > files. cd .. bzr branch trunk fix-something cd fix-something bzr merge ../trunk --uncommitted cd ../trunk bzr revert cd ../fix-something [and hack in the branch] If by ``unregistered files'' you mean files not yet added to bzr, the= n the above sequence of commands is not much more complicated. Most importantly, one needs to _think_ before they start hacking, and one of the important questions to ask oneself is "is this change really a quickie?". So I still maintain that having two branches bound to trunk is going to be pure useless overhead, most of the time. YMMV, of course.