From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Olson Newsgroups: gmane.emacs.devel,gmane.emacs.auctex.devel Subject: Re: Ways of keeping Emacs 22 and external projects in sync Date: Wed, 03 Jan 2007 13:29:13 -0500 Message-ID: <87k60455hi.fsf@hariken.mwolson.org> References: <87k60b7hv5.fsf@neutrino.caeruleus.net> <85irftmi8p.fsf@lola.goethe.zz> <87k60b7hv5.fsf@neutrino.caeruleus.net> <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: multipart/mixed; boundary="===============0389865039==" X-Trace: sea.gmane.org 1167851744 20093 80.91.229.12 (3 Jan 2007 19:15:44 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 3 Jan 2007 19:15:44 +0000 (UTC) Cc: auctex-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 03 20:15:44 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 1H2BaJ-00023t-3t for ged-emacs-devel@m.gmane.org; Wed, 03 Jan 2007 20:15:35 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1H2BaI-00011p-CV for ged-emacs-devel@m.gmane.org; Wed, 03 Jan 2007 14:15:34 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1H2Ba3-000110-Ny for emacs-devel@gnu.org; Wed, 03 Jan 2007 14:15:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1H2Ba3-00010g-4R for emacs-devel@gnu.org; Wed, 03 Jan 2007 14:15:19 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1H2Ba2-00010W-TZ for emacs-devel@gnu.org; Wed, 03 Jan 2007 14:15:18 -0500 Original-Received: from [80.91.229.2] (helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1H2Ba2-0001yd-0b for emacs-devel@gnu.org; Wed, 03 Jan 2007 14:15:18 -0500 Original-Received: from root by ciao.gmane.org with local (Exim 4.43) id 1H2BZm-0003ya-7B for emacs-devel@gnu.org; Wed, 03 Jan 2007 20:15:02 +0100 Original-Received: from pool-72-69-3-36.sbndin.dsl-w.verizon.net ([72.69.3.36]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Jan 2007 20:15:02 +0100 Original-Received: from mwolson by pool-72-69-3-36.sbndin.dsl-w.verizon.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 03 Jan 2007 20:15:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-To: emacs-devel@gnu.org Original-Lines: 155 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: pool-72-69-3-36.sbndin.dsl-w.verizon.net 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: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEUXFBYyLjJSIjQ+NiBP SEpvSzJqZGaPhHyflXOXkqPJu6bq4te7uXsMAAACEUlEQVR42pXTQW8SQRQH8DcpQdvTvLDRwA0S 7xiCNvUC6ZaGD1ATPVGLY6iXVWOmLJdetCk3GgQmXNomlRTvGNgv55uZHXar7cGBZBN+/N97Mwyg /l3HNx2l4B44+f4QfOveD0cHD8DewZv/hf5f0K77NI4a7/XP78BRBSuVKsH7t+nmYrfyHDGX8zoj kYYRuuWJ8U4KDjFZnTT4KWjunK1hOKon8GR7toZD0U6kUv3pYIReQ7Sxjr7m3eo6MdBfbAhB77bf EF+kAzuT57GG79dpjpcOXHUWP7IxDB0Atw+MYbAGoAzjayimoMYYgCtVSkpl6MXhkYVhkuD5VrYG 8LhrYGDAo5lFex7sExQs2F3s0wi91errbQs2Qgu2kgo0vH4RBUz2TY+RhdkV4q/V7FVU3pz0TeKH gZy8JIgWvQgcfLaJggFafPPEQgm53u72KeJUQ5CfpADL4WmcWMRwUUJGJwRhEMOlgyKdNsPMnKbq 0eercgzvkE6T4db82sICmhZ0C854gRJA8Lul4cwAMIKQEuxjFC2DOHGhAai3huMoug2gM6HrDs+o BUFGauhMl6oFXQOlIgeqlJX9a9zQf4+aBupBlegKwAcZ6kQKiqYFk1JeOVCmlAZdScpPKaCE3h4y MTbQJOBxgoDzp0oRsAR0AgCz0VSNCeBOgi4f/QxLNY4TwFyC5fVhL8XQJgycqz9bD6iDcZJIqwAA AABJRU5ErkJggg== User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.91 (gnu/linux) Cancel-Lock: sha1:ItONGpTlHT16GZ8x3Eea44nSAuI= 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:64700 gmane.emacs.auctex.devel:1511 Archived-At: --===============0389865039== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable Ralf Angeli writes: >> sync-to-emacs: >> =3D=3D=3D >> #!/bin/bash >> >> # Load common definitions >> . scripts/common.defs >> >> (cd $LISP/erc && find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $OLD= PWD \;) >> cp $ETC/ERC-NEWS etc/ >> cp $MAN/erc.texi man/ >> rm -f *.elc >> =3D=3D=3D > > The scripts look identical. Is that correct? Sorry about that. It should have been: sync-to-emacs: =3D=3D=3D #!/bin/bash # Load common definitions . scripts/common.defs find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $LISP/erc \; find ./etc -maxdepth 1 -mindepth 1 -type f -exec cp {} $ETC \; find ./man -maxdepth 1 -mindepth 1 -type f -exec cp {} $MAN \; =3D=3D=3D Sorry about that. >> 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? Yes. Of course, it's a priority to merge releases to Emacs 22. > 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? No. I can get changes for any revision that I commit at any time, so there isn't a need for making tags. I use DVC (http://download.gna.org/dvc/) to easily fetch changes: it gives me a listing of patches that I've committed, and I only need to hit "=3D" to view the one at point in diff form. I usually do debugging in the erc--main branch, because the versions are consistent enough that problems should be replicable there. If needed, I could easily just remove the (add-to-list 'load-path ...) line for ERC from my config, and work in Emacs directly, calling sync-from-emacs when I've fixed the problem (to propagate to erc--emacs--22), and so on. >> 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? Usually I only do it when I'm about to sync to Emacs. I also do it whenever I run "tla update" on Emacs 22 (about once a month), if I notice that some ERC files were modified. > 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. That would work, too. >> I also think it is a very bad idea for Emacs developers to mandate >> checking in files individually. It might make sense for work on the >> core files in lisp/emacs-lisp/ or the top-level of lisp/, but a >> significant percentage of changes made to the other lisp files involve >> changing several files at once. Separating log entries for commit >> messages begins to become a burden. For operations such as updating >> an entire project, this would become very tedious (not to mention >> unnecessary, because ChangeLog contains all the information that is >> really needed). > > That reminds me: When you are synching from Emacs to ERC (and vice > versa) the ChangeLog file is probably handled the same way Lisp files > are. Because log entries of changes to RefTeX in Emacs currently end > up in lisp/ChangeLog we'd need a separate ChangeLog file for RefTeX > for this to work. That would be trickier. I assumed RefTeX would be getting its own subdirectory in lisp/. You might have to keep a separate ChangeLog and manually copy over ChangeLog entries when syncing to Emacs 22. >> With Arch, such changes are treated as a single change to the entire >> project, rather than multiple separate changes to single files. There >> is no possibility (however remote) of changes to several files being >> only partially applied, as long as Arch is the only version control >> system involved. > > As Savannah supports Arch repositories now it should be no problem to > maintain RefTeX in such a repository. What I would be missing with > Arch would be something like PCL-CVS and the web interface like > Savannah provides it for CVS repositories. I don't really know what PCL-CVS is used for, but DVC (link given above) satisfies me. It really brings out Arch's potential. As for a web interface, I set up one on my own webserver, and edited Savannah's configuration for ERC to point to it. Link is: http://www.mwolson.org/cgi-bin/archzoom/archzoom.cgi/erc@sv.gnu.org For safety's sake (to keep from getting close to my disk space quota), I have a cron job on my webserver that removes the generated changesets and such once a week. This assumes that ArchZoom has temp_dir =3D /home/mwolson/tmp. remove-tmp: =3D=3D=3D #!/bin/sh # Remove ArchZoom cruft PRE=3D/home/mwolson [ -d $PRE/,,tmp ] && exit 0 || : [ -d $PRE/tmp ] || exit 0 mv /home/mwolson/tmp /home/mwolson/,,tmp mkdir $PRE/tmp rm -fr $PRE/,,tmp =3D=3D=3D =2D-=20 Michael Olson -- FSF Associate Member #652 -- http://www.mwolson.org/ Interests: Lisp, text markup, protocols -- Jabber: mwolson_at_hcoop.net /` |\ | | | Projects: Emacs, Muse, ERC, EMMS, Planner, ErBot, DVC |_] | \| |_| Reclaim your digital rights by eliminating DRM. See http://www.defectivebydesign.org/what_is_drm for details. --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFFm/YA+1Ho2POo0xkRAotnAJ9rpBck9v5wKKUVaVxSXnmSt6f1WwCeKEg/ iGvL+mrS87gdTF5/q2/WCQE= =pC0H -----END PGP SIGNATURE----- --=-=-=-- --===============0389865039== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --===============0389865039==--