|
From: | Phil Holmes |
Subject: | Re: Minor release checklist |
Date: | Mon, 10 Sep 2012 16:12:54 +0100 |
To: "Phil Holmes" <address@hidden> Cc: "Devel" <address@hidden> Sent: Monday, September 10, 2012 3:59 PM Subject: Re: Minor release checklist
Il giorno lun, 10/09/2012 alle 15.08 +0100, Phil Holmes ha scritto:On http://lilypond.org/doc/v2.17/Documentation/contributor/minor-release-checklist it says:"Switch to the release branch, get changes, prep release announcement. Thisrequires a clean index and work tree. If the checkout displays modified files, you might want to run git reset --hard before continuing."I'm 99.9% sure I'm correct here, but just to be _really_ sure. This doesn'thave to be on the GUB machine, right? It can be any machine with pushability, because GUB will pull the changed files before doing the build. Ifthis is true, OK if I update the CG?If you ask GUB to build a given branch, it will fetch it from Savannah, so you're correct. Best J
Thanks, John. I'm following the CG to the letter, and type: git checkout origin/release/unstableThis puts me into detached head state - presumably because I don't have a local branch called release/unstable.
Following that with git merge originand I get "fatal: 'origin' is not a commit". I presume the intention of the merge is to get release/unstable to the same point as master? Strikes me we should not _require_ a release/unstable branch on the machine where the updates are being done. Could someone tell me the syntax to merge master into a branch in detached head state?
Thanks. (I'll update the CG once I've run it through parrot-fashion). --Phil Holmes
[Prev in Thread] | Current Thread | [Next in Thread] |