Versions Compared

Old Version 1

changes.mady.by.user Sijie Guo

Saved on

compared with

New Version 2

changes.mady.by.user Franck Cuny

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Merge GitHub Pull Requests

...

All the GitHub pull requests could be merged and closed via dl-merge-pr.py.

 

dl-merge-pr.py is a script that automates the process of accepting a code change into the project. It creates a temporary branch from apache/master, squashes the commits in the pull request, rewrites the commit message in the squashed commit to follow a standard format including information about each original commit, merges the squashed commit into the temporary branch, pushes the code to apache/master and closes the JIRA ticket.

The push will then be mirrored to apache-github/master, which will cause the PR to be closed due to the pattern in the commit message.

Note that the script will configure the remote repositories for GitHub and Apache before executing remote updates (i.e. git push and closing JIRA ticket).