Re: etc/refcards/ and new-style backquotes (was: Gnus and GPLv3)

["Miles Bader" <miles@gnu.org>]

On 8/28/07, Reiner Steib <reiner.steib@gmx.de> wrote:
> > and the refcards getting moved into etc/refcards (I don't know if
> > this move is desirable for Gnus; if not, then just move them back,
> > but if so, I guess the Makefiles etc will need adjusting?).  As this
> > is the 5.10 branch, people might want to keep an eye out for
> > problems.
>
> Hm, the etc/ reorganization is only in Emacs trunk, isn't it.  Did you
> sync from Emacs/trunk to Gnus/v5-10?

Yeah, though only because this is what I've always done.  Now that you
mention it, I guess that creates an inadvertent back-channel from the
emacs-trunk to the emacs-rel-22 branch, which probably isn't a good
thing.

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

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.

What do people think?

Thanks,

-Miles

-- 
Do not taunt Happy Fun Ball.