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:48:57 +0100 Message-ID: <87r5qblxpy.fsf@telefonica.net> References: <87fx6sm8yl.fsf@telefonica.net> <873a2slzrr.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 1262224935 32209 80.91.229.12 (31 Dec 2009 02:02:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 31 Dec 2009 02:02:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 31 03:02:08 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 1NQAM9-0007Cd-JW for ged-emacs-devel@m.gmane.org; Thu, 31 Dec 2009 03:01:41 +0100 Original-Received: from localhost ([127.0.0.1]:34123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQAMA-0000h9-4Q for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 21:01:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQA9y-00032f-Ur for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:49:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQA9u-00030G-Dc for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:49:06 -0500 Original-Received: from [199.232.76.173] (port=38786 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQA9u-000305-6w for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:49:02 -0500 Original-Received: from impaqm4.telefonica.net ([213.4.138.4]:14529) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQA9t-0004rD-MV for emacs-devel@gnu.org; Wed, 30 Dec 2009 20:49:01 -0500 Original-Received: from IMPmailhost3.adm.correo ([10.20.102.124]) by IMPaqm4.telefonica.net with bizsmtp id PdnR1d00P2h2L9m3QdozhV; Thu, 31 Dec 2009 02:48:59 +0100 Original-Received: from qcore ([88.24.214.217]) by IMPmailhost3.adm.correo with BIZ IMP id Pdoy1d0014hzqmo1jdoyY1; Thu, 31 Dec 2009 02:48:59 +0100 X-TE-authinfo: authemail="981711563$telefonica.net" |auth_email="981711563@telefonica.net" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" In-Reply-To: (Juanma Barranquero's message of "Thu, 31 Dec 2009 02:33:39 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:119097 Archived-At: Juanma Barranquero writes: >> 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. > > I'd rather have Bazaar not to generate a conflict for changes at the > top of the file; it's common enough, and I've had my share of them on > CVS :-) > > That said, what you propose could work, but of course it's quite > hackish. It works and yes, it is hackish :-) Just make sure that after every conflict resolve the first line of the ChangeLog differs from the first line of the next revision. > Let's hope someday the rebase plugin will grow an option to > rebase interactively, stopping before the commit. There is a big chance that adding that feature is very easy, and plugins are not under the very strict development policy of Bazaar, so submit a feature request to the plugin tracker: https://launchpad.net/bzr-rewrite --=20 =C3=93scar