From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Date: Thu, 05 Apr 2012 09:13:09 +0200 Message-ID: <87k41u4poa.fsf@gnu.org> References: <87k42cwys8.fsf@gnu.org> <87limhuldm.fsf@gnu.org> <871uo7g4j6.fsf@gnu.org> <87iphjhbm8.fsf@wanadoo.es> <87398lgrat.fsf_-_@niu.edu> <871uo5c7r0.fsf@wanadoo.es> <87pqbpj5j3.fsf@altern.org> <83hawzctfq.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333609943 30114 80.91.229.3 (5 Apr 2012 07:12:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 5 Apr 2012 07:12:23 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 05 09:12:22 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SFgrl-00068C-6i for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 09:12:21 +0200 Original-Received: from localhost ([::1]:46803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFgrk-00077d-Fu for ged-emacs-devel@m.gmane.org; Thu, 05 Apr 2012 03:12:20 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFgre-000773-Fi for emacs-devel@gnu.org; Thu, 05 Apr 2012 03:12:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFgrY-0002Nr-9C for emacs-devel@gnu.org; Thu, 05 Apr 2012 03:12:14 -0400 Original-Received: from mail-wg0-f49.google.com ([74.125.82.49]:34283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFgrR-0002KJ-AL; Thu, 05 Apr 2012 03:12:01 -0400 Original-Received: by wgbdr1 with SMTP id dr1so744396wgb.30 for ; Thu, 05 Apr 2012 00:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=5lcz5SgHGVmOjYABjNu9DrEVcPxhDQ+yPvyHQFg54Qs=; b=yzY+Pv0Ysl0cLux7jQwrufPiRhvUnKtbPobKEXv9Hy2gqHCEyCq2yBytRvxbU+Mb8m qp/75g6JlTsE0IJF3Xbkd/UADWHyXbHxCtqEZw+618Vzeri+ShAJE/P9xLEeFvjCu5P2 DzFk3Ezn2pSt8mfQbMp/7sDbY/LHOZGbU7Zl+cU33Kbsej+8V6gjzSskBYRejLZ+9y1j nhhGpEsQCP3DoNutI/XJSfvlpeBzwrWssywpboPmvn+F1PrDVY+Js/VuMBPKVMbJ+ryJ ZL1fON1K59GpIK1usEChPrQNDls0nsUAuMiqOPMJFJ10zwPu29Pw7fXmKAX1hW+7Da8j gLzA== Original-Received: by 10.216.133.96 with SMTP id p74mr975241wei.30.1333609918677; Thu, 05 Apr 2012 00:11:58 -0700 (PDT) Original-Received: from myhost.localdomain (pha75-11-82-236-86-204.fbx.proxad.net. [82.236.86.204]) by mx.google.com with ESMTPS id w10sm13415852wiy.3.2012.04.05.00.11.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 00:11:57 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 650B1856E; Thu, 5 Apr 2012 09:13:09 +0200 (CEST) In-Reply-To: <83hawzctfq.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 04 Apr 2012 20:12:25 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.49 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149393 Archived-At: Hi Eli, Eli Zaretskii writes: >> From: Bastien >> Date: Tue, 03 Apr 2012 15:42:24 +0200 >> Cc: emacs-devel@gnu.org >> >> The problem is: how to create a patch from Org git repo that can be >> easily applied to Emacs bzr repo. >> >> If someone can come up with a workable solution, that'd help me a lot. > > Can you describe your current workflow in this respect? I mean, the > last thing you probably want to hear is a suggestion for a workflow > that you already use, albeit imperfectly... Org git repo has three branches: - "maint" = branch for releases only - "hotfix" = branch for hotfixes against the current release - "master" = the development branch Hotfixes go to... hotfix, while ordinary development goes to master. For minor releases, we merge hotfix to maint. For major release, we merge master to maint. We add a release tag from maint. For the Emacs sync: So far, I *copied* files from the hotfix branch to Emacs, trying to review the diff before committing (obviously my brain has been asleep when I did this, and I relied too much on the assumption that I correctly backported changes to Org in Emacs to the Org git repo.) >From now on, here is what I will try to do. I have a local "emacs-merge" branch, stemming from hotfix. This local branch has a directory "emacs" that reproduce part of the hierarchy of Emacs files, that part which contains Org files. doc misc ChangeLog org.texi etc org OrgOdtContentTemplate.xml OrgOdtStyles.xml README refcards orgcard.pdf orgcard.tex lisp org ChangeLog [org/ob..el]x109 Then the sync process is this: 1. Check for org-related changes in Emacs trunk 2. Backport them to the hotfix branch 3. Copy the files from the hotfix branch to the emacs dir in my local emacs-merge branch, and get a diff from there. 4. Clean up the patch so that it applies correctly in Emacs trunk. 5. Fix merge conflicts in the hotfix branch and go back to 3 if needed. 6. Commit the diff on the "org" bzr branch (bound to the remote Emacs trunk) when things look fine. Suggestions against this workflow are welcome. -- Bastien