cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From miguelaferreira <...@git.apache.org>
Subject [GitHub] cloudstack pull request: Add scripts to merge PRs and release fixe...
Date Wed, 19 Aug 2015 15:24:53 GMT
GitHub user miguelaferreira opened a pull request:

    https://github.com/apache/cloudstack/pull/721

    Add scripts to merge PRs and release fixes forward

    As it is now, additions to CloudStack need to go through a GitHub PR and, if accepted,
merged to the Apache remote (not in GitHub). This means that merging a PR for CloudStack is
a bit more involved than merging a normal GitHub PR. In addition to that, a PR that fixes
something in an older release needs to be merged against a release branch, and then forward
merged up to master (if applicable).
    
    To help with these two kinds of merges, @remibergsma, @karuturi, @DaanHoogland and myself,
have created two scripts (contributed in this PR).
    
    One script (git-pr) helps in merging a PR from GitHub to the Apache remote. The script
will read the PR info using GitHub's API and will create a merge commit that that contains
the same commit message a normal PR merge commits has, plus, as extra info, a list of commits
that are being merged.
    
    The other script (git-fwd-merge) will create a specific merge commit message that indicates
a forward merge, and lists the commits being merged.
    
    This Apache wiki [page](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61311655)
describes how to use these two scripts, and points to an even more detailed [page](https://github.com/schubergphilis/cloudstack-git-tree-manipulation/wiki)
that explains the merge scenarios step-by-step.
    
    By the way, beacause both scripts follow the naming convention for git tools, as long
as they are in your "path" you can execute them as simply as "git pr" and "git fwd-merge".
But be aware that, in order to use these scripts, you should make sure to remove any aliases
that can cause a name clash.


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/miguelaferreira/cloudstack git-merge-scripts

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/721.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #721
    
----
commit 9211202babf8003eb8dba9b5ac337c7dc7810dc3
Author: Miguel Ferreira <miguelferreira@me.com>
Date:   2015-08-19T15:22:45Z

    Add git merge scripts

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message