About hapifhir releases and forking the main project

[Dong Wang]

I also posted on github:

Description:
I noticed that each release branch has further changes that's never merged back into master. Some of those are hot fixes. 
eg:
https://github.com/hapifhir/hapi-fhir/compare/master...rel_8_0_mb

Shouldn't the further commits in release branches always merged back to master? By doing this, it would be much easier and cleaner for the running hapi service version upgrade (eg. 8.0->8.2). As those changes that's not in 8.0 will be included and resolved in 8.2.

Background

Our team is forking the 8.0 release branch and make changes on that, we want to merge it back to master, but current master is almost at 8.4 and included lots of features in between. We are trying to figure out a way to keep our customized code, and also syncing with master branch with little effort to resolve conflicts.

How does your team handle releases/service upgrade?

[Dong Wang]

[James Agnew]

There shouldn't be any fixes on the "_mb" branch that don't eventually get copied into master (either by directly copying them, or by implementing the same fix in a different way). Is there a specific fix you're looking for that you feel is missing?

Cheers,

James

[Dong Wang]

Thanks James.

For example, rel_8_0_mb is ahead of master with 8.0.1 patch and some partitioning tweaks.

https://github.com/hapifhir/hapi-fhir/compare/master...rel_8_0_mb

Are those excluded on purpose?

[G G (Tadgh)]

Heya! I am mostly the one who does HAPI-FHIR releases. I think you are seeing a git artifact of conflict resolution in conjunction with a squash merge. While git is reporting that these are new, if you actually go and look at the files in question in the master branch, you will see that they already in fact have those changes. 

e.g.
JpaPid Change: https://github.com/hapifhir/hapi-fhir/blob/b994747fecb7b47d6ec8763da4ed5ed055c4198e/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dao/JpaPid.java#L154-L154 
RequestPartitionHelperSvc: https://github.com/hapifhir/hapi-fhir/blob/b994747fecb7b47d6ec8763da4ed5ed055c4198e/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java#L150-L150 


If there's some particular delta that is missing, please do let me know. 

Cheers, 

[Dong Wang]

Thanks Gary, this is good to know!

I saw you created another PR for 8_0 mergeback here: https://github.com/hapifhir/hapi-fhir/pull/7030

Is this trying to solve the conflict?

Thanks,

Dong

[G G]

No, that's just a false start PR that I forgot to close. We will only merge that Branch back again if we do a backport to the 8.0 branch again 

--Gary

--
You received this message because you are subscribed to a topic in the Google Groups "HAPI FHIR" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/hapi-fhir/uDAbngtYkg8/unsubscribe.
To unsubscribe from this group and all its topics, send an email to hapi-fhir+...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/hapi-fhir/c87ca78f-dc73-4f40-aefc-8c68d230d325n%40googlegroups.com.