[Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG - pushing to staging instructions

[Auto mailings of changes to Lily Issues]

• status: Fixed --> Verified

---

[issues:#4824] CG - pushing to staging instructions

Status: Verified
Labels: Fixed_2_19_41
Created: Mon Apr 11, 2016 10:15 AM UTC by Federico Bruni
Last Updated: Thu Apr 21, 2016 12:20 PM UTC
Owner: Paul Morris

First report: http://lists.gnu.org/archive/html/lilypond-devel/2015-07/msg00100.html

What do you think about these instructions?
http://lilypond.org/doc/v2.19/Documentation/contributor/pushing-to-staging

I have a few comments, but I'm not sure about any of them:

1. There's no real purpose in pulling and rebasing the staging branch, assuming that this branch should be "clean" (we should work on master or on a local branch).

2. That page should explain how to generate a patch with format-patch. I think that git format-patch origin works most of the times, at least in my setup.

3. I don't like much the git merge approach suggested for those who work with local branches, as the git log is a bit messed up (a merge commit is added, often faraway from the commit containing the real changes). I'd rather suggest using format-patch and git am even in this case.

I like Benko's approach:

$ git checkout my_branch_name
$ git fetch
$ git rebase origin/staging
[fix conflicts, run all checks, repeat from fetch, etc.]
$ git push origin HEAD:staging

Another demand for a "merge-less" approach: http://lists.gnu.org/archive/html/lilypond-devel/2016-04/msg00054.html

See also comment from Harm:
http://lists.gnu.org/archive/html/lilypond-devel/2016-04/msg00057.html

---

Sent from sourceforge.net because address@hidden is subscribed to https://sourceforge.net/p/testlilyissues/issues/

To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/testlilyissues/admin/issues/options. Or, if this is a mailing list, you can unsubscribe from the mailing list.

------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j

_______________________________________________
Testlilyissues-auto mailing list
address@hidden
https://lists.sourceforge.net/lists/listinfo/testlilyissues-auto