From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Olson Newsgroups: gmane.emacs.devel Subject: Re: org changes lost Date: Tue, 25 Nov 2008 19:20:17 -0800 Message-ID: <87myfn9nri.fsf@grepfind.mwolson.org> References: <18730.4893.357634.127478@fencepost.gnu.org> <878wr9lqtr.fsf@catnip.gol.com> <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> <118325E6-ED11-4519-BF12-8086BEA715A1@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1227672513 14766 80.91.229.12 (26 Nov 2008 04:08:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2008 04:08:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 26 05:09:37 2008 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 1L5Bia-0001DE-1y for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2008 05:09:36 +0100 Original-Received: from localhost ([127.0.0.1]:53167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L5BhQ-0005XU-Je for ged-emacs-devel@m.gmane.org; Tue, 25 Nov 2008 23:08:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L5BhM-0005WY-03 for emacs-devel@gnu.org; Tue, 25 Nov 2008 23:08:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L5BhK-0005UL-Ac for emacs-devel@gnu.org; Tue, 25 Nov 2008 23:08:19 -0500 Original-Received: from [199.232.76.173] (port=43452 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L5BhK-0005UB-6a for emacs-devel@gnu.org; Tue, 25 Nov 2008 23:08:18 -0500 Original-Received: from main.gmane.org ([80.91.229.2]:41002 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L5BhJ-0005gY-Kb for emacs-devel@gnu.org; Tue, 25 Nov 2008 23:08:17 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1L5BhE-00050J-Rk for emacs-devel@gnu.org; Wed, 26 Nov 2008 04:08:13 +0000 Original-Received: from cpe-75-84-154-172.socal.res.rr.com ([75.84.154.172]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Nov 2008 04:08:12 +0000 Original-Received: from mwolson by cpe-75-84-154-172.socal.res.rr.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Nov 2008 04:08:12 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cpe-75-84-154-172.socal.res.rr.com Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEU1QytIVTlZY0dqc1N6 hGGJl3qZpZCtuKXsjxzFAAACW0lEQVR42l2UXXrqIBCGk67Aoe29Ac4CTPDcGwZ73wLdQDOuQLP9 8wHG9hT1Mc6bb/5jp7Xed92TVrqeCYfKRVc+XdfDbqbJ8TixG1UDu2a3xkf2H+z+A6Qn7Xk71AA8 kdJmZg4xpcTshgr2JQSurAswhwDFYQN9r4yxx1BIQqBTBbvqahw9hxRSLOBdFVA89TTOvgSoMaLf ABTWOg5Z8lLRNyD7x4WSVHU1DZurThn2HI9Oa561JhTSDUWxq64YqRlmrcdhA73y3rmJY1okotDT NzDO2XNGZPnS7A4b6NQ8foQFN2eJmEBR7Du1Q/DRh7R4O50BrGmu0F8i49Iya+ScvtDNqkADB8zD pwU9wTu9c8msdNYOO0JvYYyREd9xBOh7zSNc2WMZUYzIDHOpU0Kxe5o9o0eccsr5mNLcwHhC8DoM SQkJ5wbUxAdlbDELEpDbclc8sT2gV2HJIrj/si7hDgzPpY4sqxTV+pWkgt7EGesDIFWUnGuK7pkn erZoieCVZPGcG3jCJimLwS7IVZY4R3mvoNfzoCfOF0mIG1nna+TadAxzgF5u0b3JTaxcmZtCF1dn WSOv63oNl4U3BQCLXOQKWZIHUBWcUci6iuTL7eMOelVAKfp+NkA0kOElN3BbV26AiGZsXEqfa0EQ NtATvTAKCeHh7AEEi4knM6S3HwB2eo1zeZQ5fDbgNkCpbEwh8HUTqYDqwUhIG2NQ/k2WH+CVB9LK aINy0EeAvgF6KRK0wIaPiX8CioRNpQF7X/8EOnoAPpUvrX8DED7t8B/Bv8ErfnpSfxv4B9rx7BDd lxXRAAAAAElFTkSuQmCC Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEUkEQZGKhthUz9wWCXQ jD2tnFannIH3wl/TzLL223z084309N2Wne4NAAACXklEQVQ4y22TsWvbQBTGnxLorFNI5ugKItCl IfXQ3cFraZqAPcU3HAdZE1RtjUuPo9oaHHG3B6Lr1CUI9M/1vTtLdkofErbez9/39M7vQRnCWluV 55fn4eGWLhhAc3F2mh9MZht0C4PggoU4K238aQDNmGdsYikisJW9zAdwMHctoaCo7k7ZGBPn2zaC qlpv8yjx3loXgP28AxiC1kerdb6TTw49RVA8sGTXy3nvSPGPE2MLtCKFrZavwUd0agm8KsFSemHv IgglMj6AWNwOiqOX+JlQdQ/Yy2P0OOkiSEfwawAi5EeFfUhDCdVJlOSo8BH4YMWl7IwQOYJ9Pyiw 8ayQpuuNRhFsrFr/QAKlTY+hRc42wCFImdDihIDgy5QF4Fz7mCaZ0lwFUKy+3S8I4P3EIKs7cUNg VYh3sXPv/NNpwvtO1qGGWn3/6QdFnqBNyGP8YYsBtMeJ6sfYAc9LONqCVTICfw1JPYL7HfAJ4Oa/ 4BrgDeU6uo9hC44B9gaJhv3F76H4ewCgA8HT6q5hn07Ehj4uSBLL6zQcbmvB4XDhXwV74XC7JcCh C9Nuq6qyVvDCkGSVIrCbNWhwgKSUpjZ4krzIJ3bcD2uvpKxrY4woBJu77eJEBRIt5dv5dqPWRiqS dD2CfG7bAVyhiZGY77XRfI673VQE7qgxY1Tdd9qYwsybBre2seVX09cINAJJHNPlDMdnrcjJaKX6 Dr+q7kd5O5uCs2t6F1FwLvsXwbFTM5tOp0A9cM4zHF6coTzJOVdfIhAcH3FmGS84JFma8w8EykuO ORQgChfP+AGCv0+008iY5CqoAAAAAElFTkSuQmCC User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) Cancel-Lock: sha1:SviudmxlNnl+TB/RdZLLG+zX6XE= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:106187 Archived-At: Carsten Dominik writes: > Yes. I do follow Emacs development through a git mirror, and since > yesterday I do have a local tag that is called last-sync-with-org-repo. > At lease as a double-checking mechanism this will be effective, I hope. I'd recommend using a dedicated "emacs23" branch instead of a tag. Sync just that branch with Emacs CVS. After syncing from Emacs, cherry-pick the changes you want for master (I use git add -p to group the changes into semi-atomic commits first before committing them). In order to sync to Emacs, sync emacs23 first, merge master to emacs23, *then* overwrite files in Emacs CVS using what's in the emacs23 branch (or commit first to a git repo of Emacs, then use git-cvsexportcommit to apply the patch to CVS). -- | Michael Olson | FSF Associate Member #652 | | http://mwolson.org/ | Hobbies: Lisp, HCoop | | Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner | `-------------------------------------------------------'