Re: 4.03.0 released to experimental
Ralf Treinen:
> Hello,
>
> On Mon, Nov 07, 2016 at 12:46:00PM +0000, Ximin Luo wrote:
>> Mehdi Dogguy:
>>> On 06/11/2016 19:37, Ximin Luo wrote:
>>>>
>>>> OK. I'm doing the new package now. I'm going to rename some branches in git,
>>>> atm it is a bit non-standard and confusing.
>>>>
>>>
>>> Can we discuss the renames you want to operate before doing it?
>>>
>>> What did you find non-standard? What is standard?
>>>
>>
>> Sorry, I did it already. It was:
>>
>> master -> debian/sid
>> upstream -> upstream/sid
>> experimental/master -> debian/experimental
>> experimental/upstream -> upstream/experimental
>>
>> I've seen this more often and the `gbp buildpackage` man page even names debian/sid as an example. It also better matches the debian/stretch branch that you added.
>
> this naming schema makes sense, but it is not the one we have agreed on
> in the debian-ocaml-maint team. So far we have been using for all
> packages branches master and upstream for sid, and for all other
> distributions <distro>/master and <distro>/upstream.
>
> In my opinion it does not really matter which one we use, but it would
> be helpful to use the same naming schema for all packages.
>
Ah, I didn't realise it was part of an agreed standard. What I did was according to DEP-14 as josch pointed out - thanks, I didn't know about this before.
However, I think that packages for which we *don't* need to track multiple "stable" branches, can remain in a simple {master, upstream, pristine-tar} setup. We only have a few of the others:
infinity0@moszumanska:~/pkg-ocaml-maint/packages$ for i in *.git; do hits=$(GIT_DIR=$i git branch -a | grep '\(experimental\|jessie\|stretch\)'); if test -n "$hits"; then echo $i $hits; fi; done
advi.git experimental
alt-ergo.git experimental/master experimental/upstream
bibtex2html.git experimental/master
dose3.git experimental/master experimental/upstream jessie-backports/master
hevea-doc.git experimental/master experimental/upstream
janest-core.git experimental/master experimental/upstream
oasis.git experimental/master experimental/upstream jessie/debian
ocaml-csv.git experimental/master experimental/upstream
ocamldsort.git experimental/master experimental/upstream
ocaml.git debian/experimental debian/stretch upstream/experimental remotes/origin/experimental/master
ocamlgraph.git experimental/master experimental/upstream
ocamlmakefile.git experimental/master experimental/upstream
ocamlnet.git jessie/master jessie/upstream
opam.git debian/jessie jessie
tuareg-mode.git experimental/master experimental/upstream master-experimental
type-conv.git experimental
I just noticed the dom-git-checkout script though. From the manpage, it only seems to handle the simple {master, upstream, pristine-tar} repos. I'm not sure how it handles the more complex types.
I'm also perfectly happy to revert my changes to the ocaml git repo, now that I see it is part of an established pattern. (I'd also rename debian/stretch -> stretch/debian to be consistent.) But the DEP-14 pattern is more widely adopted now and probably would help newer contributors - one less thing to learn.
X
--
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git
Reply to: