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 21:39:08 +0100 Message-ID: References: <87fx6sm8yl.fsf@telefonica.net> <873a2slzrr.fsf@telefonica.net> <83ws03db8v.fsf@gnu.org> <87d41vlok4.fsf@telefonica.net> <83vdfnc831.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1262291988 21478 80.91.229.12 (31 Dec 2009 20:39:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 20:39:48 +0000 (UTC) Cc: =?UTF-8?Q?=C3=93scar_Fuentes?= , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 21:39:41 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 1NQRo4-0004CL-03 for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 21:39:40 +0100 Original-Received: from localhost ([127.0.0.1]:34549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQRo4-0002Ds-FK for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 15:39:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQRny-0002DT-BB for emacs-devel@gnu.org; Thu, 31 Dec 2009 15:39:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQRnu-0002Cz-VI for emacs-devel@gnu.org; Thu, 31 Dec 2009 15:39:34 -0500 Original-Received: from [199.232.76.173] (port=60991 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQRnu-0002Cw-Pe for emacs-devel@gnu.org; Thu, 31 Dec 2009 15:39:30 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:45513) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQRnu-0001W2-0L; Thu, 31 Dec 2009 15:39:30 -0500 Original-Received: by bwz7 with SMTP id 7so9038054bwz.26 for ; Thu, 31 Dec 2009 12:39:28 -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; bh=Y0p5wIxa56rBiW2AXxI8iU5G0Wln5CczWNzUZq3IDGM=; b=PPTy0lFVrzrL0q9R1HcfTvjLxecgHR4/47QY7b3YcOY1V/QMf0Mtsen7Up5hM6R8Nv WU4xNbBsrMWBqMhgrcI6g/8moYchQ4OKhFuAkGS9R/lh8+BJ5ShMlAYbswXH5xlQ49d2 iR1X4Z/Zcd/oa65aZ7E/2JrBh+FsyAF7P9pDI= 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; b=QcFGziqJR4lHy7nD+M1Ial38ye1QXWRrZtKMc+etQ4Sy5Lqy1EmQzFdt8Za7PCZ7Xm e3rUW/jx2W0oO5kHkr1CrgnTmBE5M/pg3oNCxH5/V6X08gOpGNPK6Kh9YhEmgd+fGpJZ QeVRI+XI5iB1zueLj2qDgKmMSHulh5ttF0ZXU= Original-Received: by 10.204.24.83 with SMTP id u19mr3952089bkb.22.1262291968302; Thu, 31 Dec 2009 12:39:28 -0800 (PST) In-Reply-To: <83vdfnc831.fsf@gnu.org> 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:119173 Archived-At: On Thu, Dec 31, 2009 at 19:27, Eli Zaretskii wrote: > So what problem was it in this case, for which rebase is a solution? > Is it the case of a number of small unrelated changes that somehow > accumulated in the local branch? Yes. Not that "somehow accumulate", but that I want to accumulate, because I don't want to have to branch (and bootstrap) ten times for ten different small patches that cannot be committed before the release. FWIW, I *don't* have currently ten such commits, just one or two; but I'm not very inclined to branch just to remember to change "(defun xxx-mode () ...)" to "(define-derived-mode xxx-mode ...)" in a few weeks/months. Juanma