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: Thu, 31 Dec 2009 02:04:40 +0100 Message-ID: <873a2slzrr.fsf@telefonica.net> 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: 8bit X-Trace: ger.gmane.org 1262221539 25178 80.91.229.12 (31 Dec 2009 01:05:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 01:05:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 02:05:31 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 1NQ9Te-0005UQ-Gj for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 02:05:22 +0100 Original-Received: from localhost ([127.0.0.1]:48757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ9Te-00066K-OV for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 20:05:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQ9TY-000666-Gl for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:05:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQ9TU-00065b-Js for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:05:16 -0500 Original-Received: from [199.232.76.173] (port=41922 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ9TU-00065Y-GV for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:05:12 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:59459) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQ9TT-0000o7-Ph for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:05:12 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NQ9TL-0005My-7i for emacs-devel@gnu.org; Thu, 31 Dec 2009 02:05:03 +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 ; Thu, 31 Dec 2009 02:05:03 +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 ; Thu, 31 Dec 2009 02:05:03 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 28 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:QPMNNVD5sl3EKwpL/x3G0gpD2mE= 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:119090 Archived-At: Juanma Barranquero writes: > Anyway, after thinking about the issue, I'm not sure it'd work, > because of ChangeLog. [snip] > # 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. Thinking a bit more about this... `rebase' stops if it finds conflicts, then you need to resolve the conflicts (i.e. edit the conflicted changes) and continue the rebase. If somehow the rebase finds a conflict on the ChangeLog for every rebased revision, you could fix the dates. I know by experience that Subversion generates a conflict every time two changes append lines to a file. If bzr generates a conflict when two changes happen at the top of the ChangeLog file, you could arrange things for this to happen: the first revision should conflict right away; for the second revision to conflict, you'll need to leave the top of the ChangeLog on a way that it can't merge the second revision, etc. -- Óscar