unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de>
Subject: Re: merge emacs Gnus changes
Date: Sun, 19 Sep 2004 21:40:37 +0200	[thread overview]
Message-ID: <v9r7oyhwsq.fsf@marauder.physik.uni-ulm.de> (raw)
In-Reply-To: <20040918131628.GA29956@fencepost> (Miles Bader's message of "Sat, 18 Sep 2004 09:16:28 -0400")

On Sat, Sep 18 2004, Miles Bader wrote:

> On Thu, Sep 16, 2004 at 09:45:45AM -0400, Miles Bader wrote:
>> > My assumption (so far) is that all fixes on the v5-10 branch are
>> > already on the trunk in some form (often a modified form of
>> > course).

This is the case for most fixes, of course.  After the release of
5.10.6 bug fixing was (mainly) done on the trunk.  Only in the last
few weeks bug fixes have been ported back to v5-10.

There are at least the following situations were such merges make
sense:

- New bug fixes committed by the Gnus developers.  E.g. my last two
  changes in v5-10.

- Changes from Emacs' repository (or did you already merge those in
  the Gnus trunk, too?)

- My next change: Adding ":version" to all new defcustoms.

  This will give a couple of rejects in gnus-sum.el, gnus-group.el and
  gnus-art.el.  I can resolve those manually in case you want to skip
  them.

>> BTW I _can_ do such merges, but there should be some guideline.
>
> I've merged all changes to date (v5-10 -> gnus trunk).
>
> I assume there will probably be relatively few changes on the
> branch, so I'll just merge anything I see in the future too (the
> main effort is eliminating duplicates [especially in the ChangeLog],
> but that's not too hard with such a low volume).

This makes sense, I think.  Thanks a lot!

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

  reply	other threads:[~2004-09-19 19:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-10 10:25 nndb.el requires tcp Eli Zaretskii
2004-09-10 10:50 ` Simon Josefsson
2004-09-10 11:31   ` Eli Zaretskii
2004-09-10 11:49     ` Simon Josefsson
2004-09-10 12:38       ` Reiner Steib
2004-09-10 13:07         ` Simon Josefsson
2004-09-10 14:01           ` Miles Bader
2004-09-16 13:27             ` merge emacs Gnus changes (was: nndb.el requires tcp) Reiner Steib
2004-09-16 13:38               ` Miles Bader
2004-09-16 13:45                 ` Miles Bader
2004-09-18 13:16                   ` Miles Bader
2004-09-19 19:40                     ` Reiner Steib [this message]
2004-09-19 20:43                       ` merge emacs Gnus changes Reiner Steib
2004-09-19 21:00                       ` Miles Bader
2004-09-10 14:12           ` [Gnus] @copying in {pgg,sieve}.texi; FLIM files (was: nndb.el requires tcp) Reiner Steib
2004-09-17  9:05 ` nndb.el requires tcp Kai Grossjohann
2004-09-17 13:25   ` Lars Magne Ingebrigtsen
2004-09-18 19:07     ` Richard Stallman
2004-09-18 20:13       ` Lars Magne Ingebrigtsen
2004-09-20  0:05         ` Richard Stallman
2004-09-20  7:59       ` Kai Grossjohann
2004-09-17 23:21   ` 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=v9r7oyhwsq.fsf@marauder.physik.uni-ulm.de \
    --to=4.uce.03.r.s@nurfuerspam.de \
    --cc=Reiner.Steib@gmx.de \
    /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).