From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Thu, 31 Dec 2009 00:57:54 +0100 Message-ID: References: <87fx6sm8yl.fsf@telefonica.net> 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 1262217531 16351 80.91.229.12 (30 Dec 2009 23:58:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Dec 2009 23:58:51 +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 Thu Dec 31 00:58:44 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 1NQ8Qr-0008UY-50 for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 00:58:25 +0100 Original-Received: from localhost ([127.0.0.1]:46678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ8Qr-0006hv-OG for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 18:58:25 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQ8Qn-0006hg-Gy for emacs-devel@gnu.org; Wed, 30 Dec 2009 18:58:21 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQ8Qi-0006go-1E for emacs-devel@gnu.org; Wed, 30 Dec 2009 18:58:20 -0500 Original-Received: from [199.232.76.173] (port=56135 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ8Qh-0006gl-Qf for emacs-devel@gnu.org; Wed, 30 Dec 2009 18:58:15 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:65370) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQ8Qh-0004K3-8p for emacs-devel@gnu.org; Wed, 30 Dec 2009 18:58:15 -0500 Original-Received: by bwz7 with SMTP id 7so8611703bwz.26 for ; Wed, 30 Dec 2009 15:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=ffnqFO79jO7O1TcLGqYKGG4fefSQJUbniW2XsfcvA4w=; b=KfxjM8X3lYXh2cUkhqhBNbz2qtNvX0n7qzKIcG+tftltRwGQ3Zx7VicTv1vxuaO3oo SQHHwb2VkDWUaqxuDbMElGqHgeS/qCu9qjJZGEcY+MHLFbS7r3DFnACk3QqNbOsfXBlI /xSbIJNhVr3YwEtU8hTuzPIWAx1X8iVH8/NDw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=KV2AWDEC+EaL1fmJTRMXadbsZKPJ9ISsAtW8J7s/vy52Zybrc1//K9otJoWeOozizW 1kCO16sAESOkg71GyGCX7hlDTCbggAZdplyZBLBT7pbHlvsEJJiZQhJ1aYiQaGTfECOK ZDpBHKBmoxAzqkbQqmXIE3gDh7kVU791Eymt0= Original-Received: by 10.204.156.19 with SMTP id u19mr5910048bkw.62.1262217494166; Wed, 30 Dec 2009 15:58:14 -0800 (PST) In-Reply-To: <87fx6sm8yl.fsf@telefonica.net> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:119082 Archived-At: On Wed, Dec 30, 2009 at 22:46, =C3=93scar Fuentes wrote: > *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. If my post-23.2 branch is branched from my local trunk mirror, will "bzr push" push to it? Will that work when trunk is a bound branch? Or are you suggesting branching post-23.2 from bzr.savannah.gnu.org/srv/bzr/emacs/trunk? Anyway, after thinking about the issue, I'm not sure it'd work, because of ChangeLog. cd emacs branch trunk post-23.2 cd post-23.2 # hack hack hack, including editing ChangeLog # days pass # 23.2 released cd ../trunk bzr update cd ../post-23.2 bzr rebase bzr push # ugh # dates in ChangeLog are wrong, so you need an additional commit to fix the ChangeLog entries so it only really works for fixes that do not need ChangeLog entries. Juanma