Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modification on test_IO.m and test_buildblock.m #923

Closed
wants to merge 1 commit into from

Conversation

luciferlys
Copy link

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.

Copy link
Collaborator

@KrisThielemans KrisThielemans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@luciferlys
Copy link
Author

It's really strange. I only git add these two test files. I'll try to revert the other files to their current version.

@luciferlys
Copy link
Author

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.

@KrisThielemans
Copy link
Collaborator

hmm. I suppose your started from a 4.1.1 checkout then. still surprises me, but fine.

let's try the following

git fetch origin
git rebase origin/master

with any luck, you won't have conflicts, and there will be only 1 commit remaining (on top of what is current master). If that works (and git diff origin/master just shows your changes only), then do

git push --force yourfork lys_stir

(replacing yourfork with how you called your fork as remote).

If it descends into a nightmare, you can do

git rebase --abort

I would then suggest to start from scratch and say

git checkout origin/master
git checkout -b lys_stir_swig
# just pick "your" commit
git cherry-pick 457681d079c5da1e167d4594f3a9444655cddfe8
git log

if that all looks fine, you can still push that to this PR (somewhat confusingly) by doing

git push --force yourfork lys_stir_swig:lys_stir

Or as opposed to doing the cherry-pick, you can just copy the files of course, and just create a new PR.

@KrisThielemans
Copy link
Collaborator

Abandoned in favour of #929

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants