Community mailing list archives

community@mail.odoo.com

Re: Buildout: SHA vs TAG

by
Anybox, Georges Racinet - Co-Founder at Anybox. Python developer, CPS lead dev.
- 05/29/2015 13:20:13
On 05/28/2015 06:18 PM, Lorenzo Battistini wrote:
<blockquote cite="mid:CAG0cPwA50wLbTBk=aJ8Aio2B1DjtvZu4PiD-HkRnUfZ9wc93-A@mail.gmail.com" type="cite">
On 26 May 2015 at 12:05, Leonardo Pistone <leonardo.pistone@camptocamp.com> wrote:
Hi Lorenzo.

If we had one module per repository, we could update the version
number when we make important changes, and tag the repo with the
version number every time. We can't, since the repo contains many
modules and we don't know what to tag and when.

So we are stuck with commit hashes. If your branch is rebased, the old
hash should still be available until it is garbage-collected (probably
a month or so, i'm not sure). So it will work for a while, and then at
some point disappear.

If you want to get the latest commit of an unmerged pull request, but
still pin the hash in the main repository, since version 1.9 of the
recipe you can add a line like

merges = git origin parts/department pull/42/head

in your buildout. This takes advantage of the fact that with github,
you can pull the branch associated to pull request 42 with "git pull
origin pull/42/head" without knowing the name of the proposed remote
and branch. This will not pin the revision in the pull request, but it
might be enough if the PR is not active and is just waiting a merge.

            

I didn't know the 'merges' directive. It should solve most of our problems.
Thanks Leonardo (and thanks to Georges for developing it ;-) )

Well, thank you, but actually, it's Stefan Rinjhart's doing (at least for the first, bzr, version), then IIRC Stéphane Bidoul or Laurent Mignon for the Git adaptation.