Fix scc check-prs by using find_branching_point()#158
Conversation
This commit addresses a tricky issue where a branch originated from an ancestor commit is merged simultaneously in the source and target branches. In that case, `git merge-base` will return this ancestor commit instead of the true branching point. To fix this, CheckPRs now uses find_branching_point already used in Rebase().
|
Before testing, etc. a quick thought: does anything else use "merge-base"? |
|
Yes a quick grep shows |
|
SVP. |
|
Actually, going through the command again, we may want to use exactly |
|
Hmmm....that seems slightly surprising, but I guess it's possible. |
This should allow get_rev_list() to work for submodules
|
After latest commit, seems to be working great, @joshmoore willing then good to merge. |
|
Haven't had time to test. Don't let me hold up the release. Certainly having check-prs back online is more important than |
|
@joshmoore: since last commit was pushed today, I will wait for http://ci.openmicroscopy.org/view/Mgmt/job/SCC-merge/ output first. |
|
Fine by me. |
|
http://ci.openmicroscopy.org/view/Mgmt/job/SCC-merge/291/ is green. Merging. |
Fix scc check-prs by using find_branching_point()
3 participants
This commit addresses a tricky issue where a branch originated from an
ancestor commit is merged simultaneously in the source and target branches.
In that case,
git merge-basewill return this ancestor commit instead ofthe true branching point. To fix this, CheckPRs now uses find_branching_point
already used in Rebase().
This PR should fix http://ci.openmicroscopy.org/view/Mgmt/job/SCC-check-prs/.
To test this PR in context, run
python scc/main.py check-prs dev_5_0 developfrom openmicroscopy.git and check the output is valid.