Skip to content
Snippets Groups Projects

WIP: Test of Non linear history detection #1852

Closed Pierre-Alain Loizeau requested to merge p.-a.loizeau/cbmroot:non_linear_dest into master

Test of the fix introduced to avoid repetition of #1852

Test if the build system properly detect merge commits and parallel branches introduced only in fork on top of current upstream/master HEAD

Edited by Pierre-Alain Loizeau

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @v.friese @f.uhlig

    Test seems to work and properly detect the non-linear history with the proper count of "merge commits to remove" (checking only the new commits and therefore excluding the one already present in upstream/master).

    One thing we may want to improve later is that, even if it is logically parallel, the test is not running in parallel to "RebaseCheck" due to the fact that we have only one runner. We may solve this either by:

    • Running on the Linux runner (#40) and the other on the MacOs runner (#69)
    • Adding one more Linux runner, which then unfortunately needs to be added to all developer forks
  • Pierre-Alain Loizeau changed title from WIP: Test of Non linear history detection to WIP: Test of Non linear history detection #1852

    changed title from WIP: Test of Non linear history detection to WIP: Test of Non linear history detection #1852

  • Pierre-Alain Loizeau changed the description

    changed the description

  • Pierre-Alain Loizeau mentioned in merge request !117 (closed)

    mentioned in merge request !117 (closed)

Please register or sign in to reply
Loading