[Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG

[Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG - pus

From:

Auto mailings of changes to Lily Issues

Subject:

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

Date:

Tue, 12 Apr 2016 20:53:01 +0000

Doc: CG: push to staging with rebase not merge

Use 'git pull -r' for consistency with other
parts of the CG.

http://codereview.appspot.com/292370043

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

Status: Accepted
Created: Mon Apr 11, 2016 10:15 AM UTC by Federico Bruni
Last Updated: Tue Apr 12, 2016 08:53 PM UTC
Owner: nobody

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:

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).

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.

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

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.

------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z