Re: New branch for No Gnus

[Raphael Kubo da Costa <rakuco@FreeBSD.org>]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> As previously discussed

Shamefully, I have not watched all the recent threads here, so I'm not
sure what the purpose of keeping master from a "stable" branch is. Would
it be possible to clarify that to a newcomer (ie. only the stable branch
is merged back into Emacs etc)?

> As usual, I have no idea how to actually do something like that with
> git, so could someone give a recipe?  :-)

I guess it depends on the above: one possibility would be creating a
branch off master and regularly (or whenever you guys feel it's
necessary) merge it back into master to make it receive the bug fixes as
well. What's not clear is whether the same branch will be used in the
future for the same purpose. If it's not, one could do something as
follows:

 $ git checkout -b no-gnus-with-unique-version-identifier master
 $ # edit files, commit etc
 $ git push origin no-gnus-with-unique-version-identifier

And then later:
 $ git checkout master
 $ git merge [--log] no-gnus-with-unique-version-identifier
 $ git push origin master

Merging the ChangeLog entries can be problematic, though.