Re: New branch for No Gnus

[Steinar Bang <sb@dod.no>]

>>>>> Lars Ingebrigtsen <larsi@gnus.org>:

> Well, I'll probably be having separate directories ngnus and mgnus for
> the two branches, so that I can test and run them concurrently.  So I
> won't be pivoting branches (in the same directory) any, I think?

This is not a good idea if you want to easily merge changes between the
two branches.  Then you should have the same layout and two separate git
branches. 

In short: you lose the main advantage of git ("merge is *easy*")

First of all: switching branches is a very low cost operation, so your
main time usage when switching will be building gnus.

Secondly, you can easily have two gnusen side by side without
sacrificing any git-goodies:
 mkdir ~/git
 cd ~/git
 git clone https://git.gnus.org/gnus.git
 mv gnus ngnus
 cd ngnus
 git checkout -b no-gnus
 git push origin HEAD
 git checkout master
 git branch -D no-gnus
 git checkout no-gnus
 git branch -D master
 git clone https://git.gnus.org/gnus.git
 mv gnus mgnus

This will give you two gnusen side by side, each on a different git
branch, with no other clutter (that's what the "git branch -D" is
about), and merging between the branches can be done by pushing and
fetching from origin.

The ngnus directory is on the no-gnus branch.

Alternatively, if ngnus is to remain the master branch until emacs 24 is
out (to ease updating beteen emacs bzr and gnus git), your can do this:
 mkdir ~/git
 cd ~/git
 git clone https://git.gnus.org/gnus.git
 mv gnus ngnus
 git clone https://git.gnus.org/gnus.git
 mv gnus mgnus
 cd mgnus
 git checkout -b mgnus
 git push origin HEAD
 git checkout master
 git branch -D mgnus
 git checkout mgnus
 git branch -D master

Then ~/git/mgnus/ will be on the mgnus branch.

With this configuration, to get the newest ngnus changes into mgnus, do
this:
 cd ~/git/mgnus/
 git fetch
 git merge origin/master
 git push origin HEAD

Most of the time, merge will be a painless and conflict free operation.