From: Avery Pennarun <apenwarr@gmail.com>
Date: Mon, 05 Apr 2010 19:36:51 GMT
Subject: Re: How to keep different version numbers in different branches?
Message-ID: <n2x32541b131004051236m3a800c57k41536729ae3f192@mail.gmail.com>
In-Reply-To: <vpqd3ydr9g6.fsf@bauges.imag.fr>

On Mon, Apr 5, 2010 at 3:22 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> You can even make sure it _never_ happens, by making a one-commit
> release branch which changes the version number for each release. This
> one-commit is never merged in anything:
>
>  0.1                         0.2
>  |                           |
>  v                           v
> --o--o--o--o--o--o--o--o---o--o--o <--- master branch
>   \                      /
>    o--o--o--o--o--o--o--o--- ...  <--- maintainance branch
>           \              \
>            o <- 0.1.1     o <- 0.1.2
>
> Here, the maintainance branch never changes the version number in
> README & friends.

This works too.  In fact, I even do it on one of my projects.
However, I find it a little annoying, because then I don't know which
version to tag: the pre-number-changed version, or the
post-number-changed version.

The latter sounds like the obvious answer, but if I do that, then "git
describe" never says anything useful on my master branch.  But if I do
the former instead, then the tag doesn't accurately reflect the
version I *actually* released.

I've never found an adequate solution to this problem, other than not
including the version number in the repo at all.

Have fun,

Avery