Re: New branch for No Gnus

[Lars Ingebrigtsen <larsi@gnus.org>]

Steinar Bang <sb@dod.no> writes:

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

Yes, and that's not an option.  I will usually be using Ma Gnus, but
testing bug fixes with No Gnus, and a work flow that requires me to...
do something...  to switch between the two is just out of the question.

> Secondly, you can easily have two gnusen side by side without
> sacrificing any git-goodies:

Yes, that's what I was meaning to say.  :-)  Two directories that point
to different branches.  

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

Thanks.  I think all merging will be from no-gnus to ma-gnus, and not
the other way around.  Unless I mess stuff up.  :-)

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

Except for the ChangeLog, but I've installed git-merge-changelog now,
and hope that that'll fix stuff.

-- 
(domestic pets only, the antidote for overdose, milk.)
  http://lars.ingebrigtsen.no  *  Sent from my Rome