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: Workflow to accumulate individual changes? Date: Thu, 31 Dec 2009 06:21:36 +0200 Message-ID: <83ws03db8v.fsf@gnu.org> References: <87fx6sm8yl.fsf@telefonica.net> <873a2slzrr.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262233201 14313 80.91.229.12 (31 Dec 2009 04:20:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 04:20:01 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 05:19:54 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 1NQCVr-0005U0-A9 for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 05:19:51 +0100 Original-Received: from localhost ([127.0.0.1]:45112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQCVr-0001zs-9b for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 23:19:51 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQCVm-0001zU-5a for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:19:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQCVh-0001vZ-BC for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:19:45 -0500 Original-Received: from [199.232.76.173] (port=51167 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQCVh-0001vW-5K for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:19:41 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:51030) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQCVg-0000cq-QZ for emacs-devel@gnu.org; Wed, 30 Dec 2009 23:19:41 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KVI00C00168D500@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Thu, 31 Dec 2009 06:19:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVI00C611BYGO00@a-mtaout21.012.net.il>; Thu, 31 Dec 2009 06:19:11 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.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:119107 Archived-At: > From: Juanma Barranquero > Date: Thu, 31 Dec 2009 02:33:39 +0100 > Cc: emacs-devel@gnu.org > > That said, what you propose could work, but of course it's quite > hackish. Let's hope someday the rebase plugin will grow an option to > rebase interactively, stopping before the commit. Except that most experts on bzr I've read say rebasing is the wrong way to go[1]. So I think we should not flee to that corner so easily, upon bumping on the first problematic issue. ChangeLog files will present a problem for feature branches and quick-fix branches alike. Though an annoyance, I don't see how it is a problem significant enough to recommend rebase as the main vehicle of routine work, given the downside of rebasing (rewriting history etc.). Am I missing something? --------------- [1] http://fourkitchens.com/blog/2009/04/20/alternatives-rebasing-bazaar