On 1 May 2014 16:19, Kirill Elagin <kirela...@gmail.com> wrote: > On Thu, May 1, 2014 at 5:43 PM, Bjørn Forsman <bjorn.fors...@gmail.com> > wrote: >> >> To complicate further, if the release tag is made on the release >> branch and is not reachable from master, I don't think "git describe" >> on master will find that tag at all. > > Sure, but there are normally no commits in the release branch (before actual > release) > that are not in master, so it should be safe to merge the branches. We can > just require this merge > right after creating the release [annotated] tag during the release > procedure.
Yes, it should be safe. 1. git tag -a -m "Release 14.04" v14.04 release-14.04~N # Adjust N to match nixos-version output on stable channel, https://github.com/NixOS/nixpkgs/commit/21e8cfac80c6c0ccac87ec8947d895fae485b7da 2. git checkout master 3. git merge release-14.04 If all goes well: git push && git push --tags Best regards, Bjørn Forsman _______________________________________________ nix-dev mailing list nix-dev@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-dev
