Re: etc/refcards/ and new-style backquotes

[Reiner Steib <reinersteib+gmane@imap.cc>]

On Thu, Aug 30 2007, Miles Bader wrote:

> [The gnus relevant merges I do are:
>
>   gnus-5.10 -> emacs-rel-22
>   emacs-trunk -> gnus-5.10
>   gnus-5.10 -> gnus-trunk
>   emacs-rel-22 -> emacs-trunk
> ]
>
> So... I suppose that it would be better to only sync changes from the
> emacs-rel-22 emacs branch to the gnus-5.10 branch?  Or alternatively,
> it could be decided that the gnus-5.10 branch should be linked with
> the emacs trunk instead of the rel-22 branch.  [I _tentatively_ favor
> the latter, as it's always seemed to me that the changes to the 5.10
> branch are sometimes a wee bit aggressive considering it's a release
> branch.]

Do you have specific changes in mind?  I don't recall that we
introduced any regressions or other problems.

I don't understand your argument here.  As the Emacs trunk is open for
any changes now, it seems quite dangerous to me to sync changes from
Emacs trunk to gnus-5.10, isn't it?

> If it's decided to keep the 5.10 branch associated with the emacs
> rel-22 branch, I'd favor reverting the changes mentioned previously
> which aren't on the emacs rel-22 branch.
>
> However if that's decided, there will be no merge channel from the
> emacs trunk to gnus, which is not good I think.  In that case, I could
> start merging from the emacs-trunk to the gnus-trunk ... but with
> multiple merge channels between emacs and gnus, things are starting to
> get a bit hairy.... I'm not sure how well it would work out in
> practice.

Isn't the latter what we discussed in the thread "Syncing Gnus and
Emacs repositories"?
(cf. <http://thread.gmane.org/gmane.emacs.devel/72807>, when Gmane is
back again)

IMHO, we should have:

- gnus-5.10 <-> emacs-rel-22

  Because both should contain only bugfixes for 5.10.*/5.11.

- gnus-trunk <-> emacs-trunk

  To get more and early testing on No Gnus.

- gnus-5.10 -> gnus-trunk and/or emacs-rel-22 -> emacs-trunk

  To ensure bug fixes also go into the development series.
  "and/or", because both mostly do the same, if we have the two other
  channels in place.

Could you explain what kind of (new) problems you'd expect in this
scenario?

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