Re: Emacs branches in git

[Bill Wohler <wohler@newt.com>]

Dmitry Gutov <dgutov@yandex.ru> writes:

> Bill Wohler <wohler@newt.com> writes:
>
>> master: For tagged releases.
>>
>> dev: How trunk is used now.
>
> Why is that?
>
> 1. People can put tags on revisions in release branches. Why dedicate a
> branch just for release tags?

Please see http://nvie.com/posts/a-successful-git-branching-model/ for
the rationale. Also, in git, release branches are deleted when they are
no longer needed.

> 2. I suspect that at least some releases won't be direct descendants of
> one another. I.e. there won't be a way to have all release revisions on
> one branch.

Yes, that is one reason why you want to tag on master.

As a related aside, I find that after tagging a release on master, it is
helpful to merge master into the release branch and then in into dev.
That way, "git describe" can refer to a reasonable tag no matter which
branch you are on.

-- 
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD