Modification on test_IO.m and test_buildblock.m#923
Modification on test_IO.m and test_buildblock.m#923luciferlys wants to merge 1 commit intoUCL:masterfrom
Conversation
KrisThielemans
left a comment
There was a problem hiding this comment.
I'm not sure how you got changes in other files (or even commits) in this PR. I guess you could either create a new PR with only changes in the .m files, or revert the other files to their current version on master
|
It's really strange. I only git add these two test files. I'll try to revert the other files to their current version. |
|
I checked again. It seems like these two files are not modified by me. In 'master' branch, they're modified 5 months ago. However, in the branch I just created they are modified 4 months ago with the commit message made by you 'release 4.1.1'. I really have no idea why it is. |
|
hmm. I suppose your started from a 4.1.1 checkout then. still surprises me, but fine. let's try the following with any luck, you won't have conflicts, and there will be only 1 commit remaining (on top of what is current (replacing If it descends into a nightmare, you can do I would then suggest to start from scratch and say if that all looks fine, you can still push that to this PR (somewhat confusingly) by doing Or as opposed to doing the cherry-pick, you can just copy the files of course, and just create a new PR. |
|
Abandoned in favour of #929 |
In these two test files, function 'isequal' is used in some places and that would throw out errors because of possible conflicts with the current version of STIR. So I just replaced all 'isequal' by 'eq', which probably has the same feature and work well with current STIR. Now the these two tests can be run successfully without any errors.