Commit merged to systemtests/master that shouldn't have been

[Martyn Gigg]

The system tests are currently broken on master on Windows. After some digging I discovered that this commit ​https://github.com/mantidproject/systemtests/commit/1c57c2b33fc6be17f567f09121219356a29f55bb relating to #7976 was merged on Friday. The merge of that commit also seems to have merged in ​https://github.com/mantidproject/systemtests/commit/06094c90762a84248e94af2e025ea04196168a13 to master. This commit was not supposed to have been merged yet as the ticket is not finished.

My suspicion is that the branch feature/7976_replace_flatabs_with_python was started based off feature/5421_IDA_bayes_interface rather than master.

[Martyn Gigg]

We need to undo the changes on master by doing

git new -p bugfix 8122 undo_accidental_merge
git revert 06094c90762a84248e94af2e025ea04196168a13
git publish
git checkbuild

After you have done this you'll need to do

git checkout feature/5421_IDA_bayes_interface
git checkbuild

to get the changes back on develop.

[Martyn Gigg]

Merge remote-tracking branch 'origin/bugfix/8122_broken_systests_on_master'

Full changeset: ​2774cf030f76a79ddf3f2071d3f70d8469640411

[Stuart Campbell]

This ticket has been transferred to github issue ​8967