Trunk-5480 Make ModuleUtil support more version specification format #2832
Conversation
This file contains 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
|
@mks-d Can you review it please? I know that the documentation changes are not very good but i dont know how to get it right. Thanks a lot. |
mks-d
requested changes
Feb 14, 2019
|
@mks-d added the tests for edge cases . I hope that i didnt miss something . I wait your review . Thanks |
|
@mks-d i think i broke the commit history by trying to squash this branch. How can i fix? |
|
Locally, start off a fresh master and cherry-pick the one commit on top: git checkout -b tmp upstream/master
git cherry-pick 0d83e403ccd1a1a332404b97c9701abc3b724c75
# here make sure that you have indeed the latest master PLUS the one commit
git log -20 --oneline --format='%h %<(150,trunc)%s'
# now let's archive the current TRUNK-5480
git branch -m TRUNK-5480 archive
# now let's make tmp the new TRUNK-5480
git branch -m TRUNK-5480
# finally let's push off the new TRUNK-5480
git push -f origin TRUNK-5480I'm assuming that your remote is named |
|
@mks-d it worked like a charm .Thank you very much . |
mks-d
requested changes
Feb 21, 2019
Added the edge cases tests
|
@mks-d thanks for review . I did the requested changes. |
|
@mks-d i think the PR is almost ready for merge. |
|
@mks-d this pr needs review. |
ibacher
force-pushed
the
master
branch
2 times, most recently
from
e8f7850
to
1877e06
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/TRUNK-5480
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).
No? -> read here on how to squash multiple commits into one
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master