From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel,gmane.emacs.auctex.devel Subject: Re: Ways of keeping Emacs 22 and external projects in sync Date: Mon, 1 Jan 2007 20:36:56 +0200 Message-ID: <20070101183656.GB6352@kobe.laptop> References: <87sley46bb.fsf@neutrino.caeruleus.net> <87mz554e1u.fsf@neutrino.caeruleus.net> <20061231222721.GA1424@kobe.laptop> <87fyav1uwb.fsf@neutrino.caeruleus.net> <87slev5ilm.fsf_-_@hariken.mwolson.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1167676996 19080 80.91.229.12 (1 Jan 2007 18:43:16 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 1 Jan 2007 18:43:16 +0000 (UTC) Cc: auctex-devel@gnu.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 01 19:43:13 2007 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 1H1S7q-0003I3-NJ for ged-emacs-devel@m.gmane.org; Mon, 01 Jan 2007 19:43:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1H1S7q-0005w3-6E for ged-emacs-devel@m.gmane.org; Mon, 01 Jan 2007 13:43:10 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1H1S6s-0005Oa-DQ for emacs-devel@gnu.org; Mon, 01 Jan 2007 13:42:10 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1H1S6r-0005NX-JZ for emacs-devel@gnu.org; Mon, 01 Jan 2007 13:42:09 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1H1S6r-0005NB-AN; Mon, 01 Jan 2007 13:42:09 -0500 Original-Received: from [62.1.205.36] (helo=igloo.linux.gr) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1H1S6q-0006hZ-FS; Mon, 01 Jan 2007 13:42:09 -0500 Original-Received: from kobe.laptop (dialup112.ach.sch.gr [81.186.70.112]) (authenticated bits=128) by igloo.linux.gr (8.13.8/8.13.8/Debian-3) with ESMTP id l01Ifae4002056 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 1 Jan 2007 20:41:45 +0200 Original-Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.13.8/8.13.8) with ESMTP id l01IavPI006481; Mon, 1 Jan 2007 20:37:42 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.13.8/8.13.8/Submit) id l01IavAN006480; Mon, 1 Jan 2007 20:36:57 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-To: Ralf Angeli Content-Disposition: inline In-Reply-To: X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-3.672, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.53, BAYES_00 -2.60, DNS_FROM_RFC_ABUSE 0.20) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr 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:64607 gmane.emacs.auctex.devel:1498 Archived-At: On 2007-01-01 16:21, Ralf Angeli wrote: > * Michael Olson (2007-01-01) writes: > > When there are some changes that need to be propagated to Emacs 22, I > > So you are updating ERC in Emacs not on a release-by-release basis, > but rather when some important changes need to be propagated? Do you > apply a tag in that case in order to identify the file revisions if > somebody has a bug report or support request referring to the ERC > version in Emacs or do you just use the files in Emacs directly for > testing and debugging? Arch is a distributed SCM, and it can keep track of what changes have been merged. Michael mentioned that he keeps various Arch branches for synchronizing the ERC tree with Emacs: erc--main--0 :: Where development happens erc--rel--5.1 :: Where the currently previous major release (5.1) gets updated when it is time to prepare a minor release. erc--emacs--22 :: The branch which is used to sync to and from the version in Emacs 22. Merging changesets from one Arch branch to another one is easy. Arch keeps track of the changesets you have merged from erc--main--0 into erc--emacs--22. >> first check emacs--devo--0 to see if someone changed things on the >> Emacs side, by running ./scripts/sync-from-emacs. If anything is >> different than the current contents of erc--emacs--22, I immediately >> check them in (to erc--emacs--22). > > Do you regularly synch from Emacs or just when you are about to synch > to Emacs? > > My idea for RefTeX would have been that a synch from Emacs to RefTeX > is done regulary, but directly instead of using an intermediate > repository. In distributed SCM's a "branch" is, effectively, a "repository". For example, for my own Emacs stuff, I keep the following "branches" around, with Mercurial (another distributed SCM): emacs/gnu emacs/keramida Changes are automatically pulled into emacs/gnu, from a cron job, using a conversion script which pulls over changesets from CVS. I keep working in emacs/keramida, making my own changes. Whenever I want to 'resync' with the official Emacs repository, I pull changes from emacs/gnu into emacs/keramida and merge locally, inside the emacs/keramida repository-branch. After a merge, I can diff with emacs/gnu and post patches to the official Emacs source tree. My own suggestion, which pretty much matches what Michael and Miles do with Arch, is that you *do* keep intermediate merge-branches in your own repository, whatever the SCM you use will be :)