Always merge #14
Merged
Always merge #14
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The issue we saw with ome/omero-scripts#12 was: * PR 12 opened and was merged properly. * PR 12 was merged. * No other PRs were open. * Therefore, the sha1 of the module wasn't changed. In other words, the modification tracking that was in place looked solely for PR merges but didn't take into account whether or not the submodule pointer needed to be bumped. Rather than worry about trying to properly track that, this commit removes the modification check. The next step is to guarantee that the submodule will be updated to the appropriate base.
Pass the base to all submodules in order to fast-forward the pointer. If a ff is not possible, the build will fail. Also, if the submodule branch names do not match that of the main repo, the build will fail.
Merged
Member
|
Comments (per IM): Don't like having Would also be good to know why it's hanging. |
Member
|
Sebastien likes what I did (and it now actually works!) so merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix issue reported in #13 as well as other bugs
rather thanmerge --ff-only``because the latter command seemed to hang on a couple of times when calling``p.wait`` in the call commandThis script has been successfully tested with the builds 70 and 71 of the OMERO-merge-4.4 job.