[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs branches in git
From: |
Bill Wohler |
Subject: |
Re: Emacs branches in git |
Date: |
Sun, 16 Feb 2014 12:11:31 -0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) |
Dmitry Gutov <address@hidden> writes:
> Bill Wohler <address@hidden> 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 <address@hidden> aka <address@hidden>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD
- Emacs branches in git, Bill Wohler, 2014/02/15
- Re: Emacs branches in git, Dmitry Gutov, 2014/02/16
- Re: Emacs branches in git,
Bill Wohler <=
- Re: Emacs branches in git, David Kastrup, 2014/02/16
- Re: Emacs branches in git, Bill Wohler, 2014/02/16
- Re: Emacs branches in git, Dmitry Gutov, 2014/02/16
- Re: Emacs branches in git, Bill Wohler, 2014/02/16
- Re: Emacs branches in git, Dmitry Gutov, 2014/02/16
- Re: Emacs branches in git, Andreas Schwab, 2014/02/17
- Re: Emacs branches in git, Thien-Thi Nguyen, 2014/02/17
- Re: Emacs branches in git, Xue Fuqiao, 2014/02/17