merge emacs Gnus changes (was: nndb.el requires tcp)

merge emacs Gnus changes (was: nndb.el requires tcp)

[Reiner Steib]

On Fri, Sep 10 2004, Miles Bader wrote:

> On Fri, Sep 10, 2004 at 03:07:06PM +0200, Simon Josefsson wrote:
>> > Maybe it be better to install it only in Emacs CVS _or_ in v5-10 (Gnus
>> > stable branch) and let it propagate to the other by Miles' arch
>> > synching?  We should do whatever is more convenient for Miles, I
>> > think.
>
> Thanks Reiner!
>
> It's slightly easier for me if changes are installed on the Gnus v5-10
> branch, from where I can propagate them to Emacs CVS.

Did/will you also propagate changes from the v5-10 branch to the trunk
in Gnus' CVS?  Or should the Gnus developers install those changes
manually in the v5-10 branch _and_ on the trunk?

>> Syncing V5-10 and Emacs CVS automatically seems useful, but there are some
>> stuff in Gnus CVS for XEmacs compatibility that historically hasn't been
>> included in the Emacs Gnus version.
>
> I wouldn't worry about it; I think any such problems will be rare and small,
> and easily enough fixed after the fact if they escape the casual checking I
> do during merges.

ACK.

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

Re: merge emacs Gnus changes (was: nndb.el requires tcp)

[Miles Bader]

On Thu, Sep 16, 2004 at 03:27:07PM +0200, Reiner Steib wrote:
> > It's slightly easier for me if changes are installed on the Gnus v5-10
> > branch, from where I can propagate them to Emacs CVS.
> 
> Did/will you also propagate changes from the v5-10 branch to the trunk
> in Gnus' CVS?  Or should the Gnus developers install those changes
> manually in the v5-10 branch _and_ on the trunk?

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).

-Miles
-- 
I'm beginning to think that life is just one long Yoko Ono album; no rhyme
or reason, just a lot of incoherent shrieks and then it's over.  --Ian Wolff

Re: merge emacs Gnus changes (was: nndb.el requires tcp)

[Miles Bader]

On Thu, Sep 16, 2004 at 09:38:26AM -0400, Miles Bader wrote:
> > Did/will you also propagate changes from the v5-10 branch to the trunk
> > in Gnus' CVS?  Or should the Gnus developers install those changes
> > manually in the v5-10 branch _and_ on the trunk?
> 
> 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).

BTW I _can_ do such merges, but there should be some guideline.

-Miles
-- 
My spirit felt washed.  With blood.  [Eli Shin, on "The Passion of the Christ"]

Re: merge emacs Gnus changes (was: nndb.el requires tcp)

[Miles Bader]

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).
> 
> 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).

-Miles
-- 
Next to fried food, the South has suffered most from oratory.
  			-- Walter Hines Page

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/

Re: merge emacs Gnus changes

[Reiner Steib]

On Sun, Sep 19 2004, Reiner Steib wrote:

> - 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.

Oops... I have committed this on the Gnus _trunk_ instead of the Gnus
v5-10 branch.  Probably it's better if I do the commit in the v5-10
branch, too.  Miles, unless you tell me otherwise, I will do this
tomorrow.

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

Re: merge emacs Gnus changes

[Miles Bader]

On Sun, Sep 19, 2004 at 09:40:37PM +0200, Reiner Steib wrote:
> - Changes from Emacs' repository (or did you already merge those in
>   the Gnus trunk, too?)

Yes

> - 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.

No thanks, patch conflicts are no worse than worrying about special cases ...
:-)

-Miles
-- 
Yo mama's so fat when she gets on an elevator it HAS to go down.

Re: merge emacs Gnus changes

[Miles Bader]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
> Oops... I have committed this on the Gnus _trunk_ instead of the Gnus
> v5-10 branch.  Probably it's better if I do the commit in the v5-10
> branch, too.  Miles, unless you tell me otherwise, I will do this
> tomorrow.

Yes, please commit to the v5-10 branch.

Thanks,

-Miles
-- 
Freedom's just another word, for nothing left to lose   --Janis Joplin