From: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Reiner Steib <Reiner.Steib@gmx.de>, emacs-devel@gnu.org
Subject: Re: Gnus branch
Date: 19 Aug 2004 14:26:18 -0400 [thread overview]
Message-ID: <jwvpt5ndm31.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <E1BxrIE-0004Nu-BO@fencepost.gnu.org>
> I'm not sure how to handle the ChangeLog entries from Emacs/trunk:
> Assuming that all the changes that we want are in the branch now,
> and that the ChangeLog file in that branch describes those changes,
> you should copy the ChangeLog file unmodified into the trunk
> just as you copy the source files unmodified into the trunk.
> However, it sounds like you're saying we have not yet reached that point:
> Some other (maybe) important changes (by Stefan Monnier, Juanma
> Barranquero, Kim F. Storm, Sam Steingold, ...) have not been installed
> yet.
> Can you identify these changes and merge the ones we need
> into the branch?
Just to clarify: my suggestion is to first merge the gnus branch on the
trunk and then re-install the local changes that haven't made their way to
the Gnus repository yet.
For clarity of the history (i.e. to make future integration easier) it is
important to have a Gnus branch that only contains code that comes from the
Gnus repository. So we should either create a second Gnus branch (one for
importing from the repository and a temporary one to do the current
integration work before committing it to the trunk) or instead to just do
the integration work directly on the trunk, which is easier.
Stefan
next prev parent reply other threads:[~2004-08-19 18:26 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-12 23:54 Gnus branch Stefan Monnier
2004-08-13 0:08 ` David Kastrup
2004-08-13 23:58 ` Richard Stallman
2004-08-18 12:48 ` Reiner Steib
2004-08-19 18:05 ` Richard Stallman
2004-08-19 18:26 ` Stefan Monnier [this message]
2004-08-20 21:08 ` Richard Stallman
2004-08-22 21:06 ` Reiner Steib
2004-08-22 21:06 ` Reiner Steib
2004-08-30 21:51 ` Reiner Steib
2004-08-30 23:46 ` Katsumi Yamaoka
2004-08-31 22:55 ` Katsumi Yamaoka
2004-08-31 22:06 ` Richard Stallman
2004-08-31 22:46 ` Miles Bader
2004-09-01 7:49 ` Reiner Steib
2004-09-04 13:24 ` Gnus 5.10 is now on the trunk Miles Bader
2004-09-05 17:45 ` Reiner Steib
2004-09-05 23:10 ` Miles Bader
2004-09-07 3:43 ` Richard Stallman
2004-09-07 4:28 ` Miles Bader
2004-09-08 0:22 ` Richard Stallman
2004-09-07 15:01 ` Lars Magne Ingebrigtsen
2004-09-07 21:38 ` Kim F. Storm
2004-09-08 18:18 ` defcustoms without group declaration (was: Gnus 5.10 is now on the trunk) Reiner Steib
2004-09-08 0:22 ` Gnus 5.10 is now on the trunk Richard Stallman
2004-09-08 10:33 ` Lars Magne Ingebrigtsen
2004-09-06 2:08 ` Sam Steingold
2004-09-06 2:54 ` Miles Bader
2004-09-06 17:58 ` Reiner Steib
2004-09-07 0:15 ` Sam Steingold
2004-09-09 13:32 ` Gnus image problem (was: Gnus 5.10 is now on the trunk) Reiner Steib
2004-09-07 0:22 ` Gnus 5.10 is now on the trunk Miles Bader
2004-09-09 10:11 ` Miles Bader
2004-09-09 13:33 ` Where to put images for lisp packages? (was: Gnus 5.10 is now on the trunk) Reiner Steib
2004-09-09 23:28 ` Where to put images for lisp packages? Miles Bader
2004-09-23 16:22 ` Reiner Steib
2004-10-06 18:42 ` Reiner Steib
2004-10-07 1:03 ` Miles Bader
2004-10-07 7:22 ` Reiner Steib
2004-09-09 14:19 ` Gnus version numbers (was: Gnus 5.10 is now on the trunk) Reiner Steib
2004-09-09 15:49 ` Gnus version numbers Lars Magne Ingebrigtsen
2004-09-10 12:29 ` Reiner Steib
2004-09-10 13:48 ` Lars Magne Ingebrigtsen
2004-09-10 17:49 ` Stefan Monnier
2004-09-10 18:04 ` Lars Magne Ingebrigtsen
2004-09-13 17:20 ` Reiner Steib
2004-09-13 18:29 ` Lars Magne Ingebrigtsen
2004-09-14 9:49 ` Per Abrahamsen
2004-08-22 20:55 ` Gnus branch Reiner Steib
[not found] ` <E1Bz9hx-0003St-5X@fencepost.gnu.org>
2004-08-23 13:17 ` Reiner Steib
2004-08-23 23:52 ` Richard Stallman
2004-08-24 8:48 ` Reiner Steib
2004-08-25 4:40 ` Richard Stallman
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvpt5ndm31.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=Reiner.Steib@gmx.de \
--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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).