HOWTO merge commits from the integration branch » History » Version 10
Loïc Dachary, 07/10/2015 08:08 AM
1 | 2 | Loïc Dachary | After the [[HOWTO run integration and upgrade tests|tests successfully]] run on the [[HOWTO populate the integration branch|integration branch]]: |
---|---|---|---|
2 | |||
3 | 9 | Loïc Dachary | h3. Get approval from the lead |
4 | |||
5 | 6 | Loïc Dachary | * List the pull requests that have been merged in the integration branch with something like: |
6 | <pre> |
||
7 | $ git log --oneline --merges ceph/giant..ceph/giant-backports |
||
8 | 538d012 Merge 4214: osd/osd_types.cc: 456: FAILED assert(m_seed < old_pg_num) |
||
9 | 8 | Loïc Dachary | </pre> |
10 | 1 | Loïc Dachary | * Assign pull requests that have been backported and tested without interaction with the original author to the [[HOWTO#Leads|lead]] because (s)he is the one deciding if the backport is good enough. Although a discussion with the lead could be engaged before testing, it is less work for a busy lead to review a backport that is known to pass integration tests. Ask to the [[HOWTO#Leads|lead]] if the pull request can be merged by adding a message to the pull request with a URL to the test results. |
11 | 9 | Loïc Dachary | * Wait for all such pull requests to be approved. |
12 | 2 | Loïc Dachary | |
13 | 9 | Loïc Dachary | h3. Merge a pull request |
14 | 1 | Loïc Dachary | |
15 | 9 | Loïc Dachary | The backports from the integration branch can be merged (via github so that the pull requests are properly tagged as being merged) into the release branch if: |
16 | |||
17 | * the backport was done by the original developer of the commit |
||
18 | * the backport was approved by the lead (see above) |
||
19 | |||
20 | Merging the pull requests goes like this: |
||
21 | |||
22 | 1 | Loïc Dachary | * for each pull request merged in the integration branch |
23 | * go to the github web interface |
||
24 | * click on the "Merge button" |
||
25 | 8 | Loïc Dachary | * add the "Reviewed-by:" field to the input box |
26 | 10 | Loïc Dachary | * when all pull requests are merged **git log --format='%H %s' --graph ceph/$release..ceph/$release-backports** must not show any commit (i.e. the integration branch must have nothing left except merge commits because all cherry-picked commits are now found in the $release branch). |
27 | 1 | Loïc Dachary | * the $release-backports branch is reset to the $release branch to make it clear that it has been merged (git reset --hard ceph/$release) |
28 | |||
29 | 9 | Loïc Dachary | h3. Resolving the matching issue |
30 | |||
31 | For each pull request that is merged: |
||
32 | |||
33 | * go to the corresponding issue that should be listed as a link in the pull request comment |
||
34 | * change the status of the issue to *Resolved* |
||
35 | |||
36 | Note: Since the merge is not from the integration branch, the commit that has been tested won't match the SHA. This is inconvenient when trying to figure out if a mistake has been done. The content of the integration branch should be merged with a script instead of manually via the github web interface to avoid mistakes. |