openmicroscopy/snoopycrimecop — pull request #158 by sbesson (2014-04-03 09:08:44+00:00)
Title: Fix scc check-prs by using find_branching_point()

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

---

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 develop` from openmicroscopy.git and check the output is valid.