You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2020/10/10 16:54:08 UTC

[GitHub] [fineract] ptuomola opened a new pull request #1387: Merge Release 1.4.0 branch back to develop

ptuomola opened a new pull request #1387:
URL: https://github.com/apache/fineract/pull/1387

## Description

Describe the changes made and why they were made.

Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).

## Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests

- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.

- [ ] Create/update unit or integration tests for verifying the changes made.

- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.

- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/api-docs/apiLive.htm with details of any API changes

- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)

FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [fineract] ptuomola closed pull request #1387: Merge Release 1.4.0 branch back to develop (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.

ptuomola closed pull request #1387:
URL: https://github.com/apache/fineract/pull/1387


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [fineract] vorburger commented on pull request #1387: Merge Release 1.4.0 branch back to develop (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.

vorburger commented on pull request #1387:
URL: https://github.com/apache/fineract/pull/1387#issuecomment-706693198

@ptuomola re. our discussion (together with @vidakovic) in FINERACT-1154, are you sure this is right, as is? If I'm following along correctly here, you have created [a `release-1.4.0` branch](https://github.com/apache/fineract/compare/release-1.4.0), presumably from [the 1.4.0 tag](https://github.com/apache/fineract/commits/1.4.0), and then in ffed594 _Merge branch 'develop' into release-1.4.0_ (don't we want to do the opposite?), and now this PR wants to merge 16 commits from that `release-1.4.0` branch back into `develop` - which is a NOOP, with no diff.

The way I understood what you were after in FINERACT-1154 would be more something like this:

```
git checkout develop
git checkout -b FINERACT-1154_merge-1.4.0
git merge -s recursive -Xignore-all-space 1.4.0
```

This showed me 3 conflicts, which were relatively trivial to resolve; the result is https://github.com/apache/fineract/compare/develop...vorburger:FINERACT-1154_merge-1.4.0?expand=1. It's very similar to this - except for the last merge commit... your _Merge branch 'develop' into release-1.4.0_ has parents ee99f30 + e985597, whereas my _Merge tag '1.4.0' into develop (FINERACT-1154)_ has parents 3ee46b0 + ee99f30 - the "other way around" (and a later point on develop). Which is right/better? I'm honestly :smile_cat: asking, as I'm not 100% sure what we are after here. Whatever we conclude, we should then document it on https://cwiki.apache.org/confluence/display/FINERACT/How+to+Release+Apache+Fineract.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [fineract] vorburger commented on pull request #1387: Merge Release 1.4.0 branch back to develop (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.

vorburger commented on pull request #1387:
URL: https://github.com/apache/fineract/pull/1387#issuecomment-706700824


   > As far as I can see, what we need to achieve is to have the tagged 1.4.0 release commit (ee99f30) reachable from the develop branch - so that "git describe" and jgitver etc can "see" it in commit history of develop.
   
   Can I admit that I've only really fully understand now :smiling_imp: that that is the real reason for why you want to do this? I've played a bit with both `git describe` (and https://jgitver.github.io / https://github.com/jgitver/jgitver), and now see what you mean! I'll leave some related notes in FINERACT-1154.
   
   > As far as I can see, either approach will achieve that.
   
   Yeah, I think you're probably right - the order of the parents in a merge commit doesn't actually seem to really matter.
   
   > I agree with you that doing it "the other way" makes more sense - but as far as I can see, the outcome is the same regardless.
   
   OK, I've raised PR #1390 from my branch, where I have just updated the commit message, and we merge that one, just for clarity? Close this?


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [fineract] ptuomola commented on pull request #1387: Merge Release 1.4.0 branch back to develop (FINERACT-1154)

Posted by GitBox <gi...@apache.org>.

ptuomola commented on pull request #1387:
URL: https://github.com/apache/fineract/pull/1387#issuecomment-706695310


   Hi @vorburger - I'm almost sure I'm **not** doing this right :-) So really appreciate your input...
   
   As far as I can see, what we need to achieve is to have the tagged 1.4.0 release commit (ee99f30) reachable from the develop branch - so that "git describe" and jgitver etc can "see" it in commit history of develop. 
   
   As far as I can see, either approach will achieve that. The only reason resolved the merge conflict "the wrong way" (i.e. into the branch rather than into develop) was because the Github UI made me do it. I agree with you that doing it "the other way" makes more sense - but as far as I can see, the outcome is the same regardless.
   
   But I'm definitely not an expert on this, so would be very keen to understand pros / cons of either approach! 
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org