From: Giorgos Keramidas <keramida@ceid.upatras.gr>
Cc: auctex-devel@gnu.org, emacs-devel@gnu.org
Subject: Re: Ways of keeping Emacs 22 and external projects in sync
Date: Mon, 1 Jan 2007 20:36:56 +0200 [thread overview]
Message-ID: <20070101183656.GB6352@kobe.laptop> (raw)
In-Reply-To: <enb8tj$is7$1@sea.gmane.org>
On 2007-01-01 16:21, Ralf Angeli <angeli@caeruleus.net> 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 :)
next prev parent reply other threads:[~2007-01-01 18:36 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-28 22:53 CVS repository synchronization for RefTeX Ralf Angeli
2006-12-29 22:04 ` Stefan Monnier
2006-12-29 23:43 ` Ralf Angeli
2006-12-30 14:20 ` Eli Zaretskii
2006-12-30 15:08 ` Ralf Angeli
2006-12-30 15:20 ` Eli Zaretskii
2006-12-30 16:01 ` Ralf Angeli
2006-12-30 16:47 ` Carsten Dominik
2006-12-30 18:03 ` Eli Zaretskii
2006-12-30 18:50 ` Ralf Angeli
2006-12-30 19:03 ` Eli Zaretskii
2006-12-30 19:18 ` Ralf Angeli
2006-12-31 1:46 ` Richard Stallman
2006-12-30 21:28 ` Alan Shutko
2006-12-30 21:55 ` Reiner Steib
2006-12-31 22:27 ` Giorgos Keramidas
2006-12-31 23:57 ` Ralf Angeli
2007-01-01 7:09 ` Ways of keeping Emacs 22 and external projects in sync (was: CVS repository synchronization for RefTeX) Michael Olson
2007-01-01 15:21 ` Ways of keeping Emacs 22 and external projects in sync Ralf Angeli
2007-01-01 17:59 ` Reiner Steib
2007-01-01 18:36 ` Giorgos Keramidas [this message]
2007-01-03 10:43 ` Yavor Doganov
2007-01-03 18:32 ` Michael Olson
2007-01-03 18:29 ` Michael Olson
2007-01-03 19:53 ` Ralf Angeli
2007-01-03 22:37 ` Michael Olson
2007-01-01 18:20 ` Ways of keeping Emacs 22 and external projects in sync (was: CVS repository synchronization for RefTeX) Giorgos Keramidas
2007-01-01 21:56 ` CVS repository synchronization for RefTeX Richard Stallman
2006-12-30 18:23 ` Richard Stallman
2006-12-30 18:39 ` Ralf Angeli
2006-12-31 1:47 ` Richard Stallman
2007-01-01 16:01 ` David Kastrup
2007-01-02 3:09 ` Richard Stallman
2007-01-02 7:43 ` David Kastrup
2007-01-02 21:24 ` Richard Stallman
2007-01-03 8:48 ` David Kastrup
2007-01-04 2:31 ` Richard Stallman
2007-01-04 21:51 ` David Kastrup
2007-01-06 2:54 ` Richard Stallman
2007-01-06 9:14 ` David Kastrup
2006-12-30 21:54 ` Reiner Steib
2006-12-31 19:36 ` Ralf Angeli
2007-01-01 17:59 ` Reiner Steib
2007-01-01 19:12 ` Ralf Angeli
2006-12-30 22:07 ` Stefan Monnier
2006-12-29 22:59 ` Richard Stallman
2006-12-30 17:00 ` David Kastrup
2007-01-07 21:42 ` Bill Wohler
2007-01-08 19:25 ` [AUCTeX-devel] " Ralf Angeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070101183656.GB6352@kobe.laptop \
--to=keramida@ceid.upatras.gr \
--cc=auctex-devel@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.