Re: merge emacs Gnus changes

[Reiner Steib]

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/