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: Workflow to accumulate individual changes? Date: Wed, 30 Dec 2009 22:46:10 +0100 Message-ID: <87fx6sm8yl.fsf@telefonica.net> References: 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 1262209610 28170 80.91.229.12 (30 Dec 2009 21:46:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Dec 2009 21:46:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 30 22:46:43 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 1NQ6NO-000552-H3 for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 22:46:42 +0100 Original-Received: from localhost ([127.0.0.1]:45180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ6NO-00068X-Re for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 16:46:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQ6NI-000681-QR for emacs-devel@gnu.org; Wed, 30 Dec 2009 16:46:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQ6ND-000663-0M for emacs-devel@gnu.org; Wed, 30 Dec 2009 16:46:35 -0500 Original-Received: from [199.232.76.173] (port=34843 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ6NC-000660-SQ for emacs-devel@gnu.org; Wed, 30 Dec 2009 16:46:30 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:42100) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQ6NC-0000mL-HE for emacs-devel@gnu.org; Wed, 30 Dec 2009 16:46:30 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NQ6N7-0004zk-F1 for emacs-devel@gnu.org; Wed, 30 Dec 2009 22:46:25 +0100 Original-Received: from 217.red-88-24-214.staticip.rima-tde.net ([88.24.214.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 30 Dec 2009 22:46:25 +0100 Original-Received: from ofv by 217.red-88-24-214.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 30 Dec 2009 22:46:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 34 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 217.red-88-24-214.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) Cancel-Lock: sha1:QdNkocpdnHJyeerWZFHeSp+EyLQ= 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:119077 Archived-At: Juanma Barranquero writes: > Let's suppose I want to create a local post-23.2 branch where I do > want to commit small changes to install on the trunk post-release. I > don't want to be forced to create a task branch for every one of them, > because they are small changes, and a new branch implies having to > bootstrap[1] anew. So I'd like to accumulate the changes into a single > branch. > > Once the trunk is open again, what would be the procedure to install > the changes? Obviously not "bzr merge ../post-23.2", because that > would create a single [merge] commit. Will I be forced to repeat "bzr > log" and "bzr merge --revision=REVID ../post-23.2" for each change? > That seems a bit cumbersome. Is there any way to simplify it? Perhaps > a plugin? *IF* they are small changes, i.e., the sort of things that you would do on the quickfixes branch, *AND* if you didn't merge with trunk, this should work keeping the history nice: bzr commit bzr commit ... : bzr rebase bzr push The resulting history on upstream will be linear, as if you committed each change one by one on top of the previous one. -- Óscar