Community
Participate
Working Groups
Hello, Commit https://git.eclipse.org/c/jgit/jgit.git/commit/?id=448052dc2e698b2e4e5d6dbca54be773aac687da has broken the ResolveMerger API in such a way that it is no longer possible to subclass. This makes it impossible for EMF Compare to build against 2022-09 or higher. Sub-classes of the ResolveMerger need access to the WorkTreeUpdater in order to do any work at all. Please restore the visibility of this class. As it stands, EMF Compare cannot build for the 2022-12 release train. (cf https://github.com/eclipse-emf-compare/emf-compare/blob/master/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java for the class on our end that requires this)
New Gerrit change created: https://git.eclipse.org/r/c/jgit/jgit/+/196910
Gerrit change https://git.eclipse.org/r/c/jgit/jgit/+/196910 was merged to [stable-6.3]. Commit: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=4d9e004f576a5b98618ae212a2cb2ac9bc50d3b2
WorkTreeUpdater is now a protected subclass of ResolveMerger and thus accessible to subclasses of ResolveMerger
Thanks Matthias, Is this available in a consumable build of 6.3.1? I need this to be able to build EMF Compare and I'm already past my +2 day.
I plan to merge this up to stable-6.4 and produce jgit's 6.4.0-M3 from that. I guess this takes a couple of hours from now. Would that be sufficient ? If needed I can also tag a service release 6.3.1. Other than that we have the stable-6.3 SNAPSHOT build here https://repo.eclipse.org/content/unzip/snapshots.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/6.3.1-SNAPSHOT/org.eclipse.jgit.repository-6.3.1-SNAPSHOT.zip-unzip/
I mostly need a consumable build to prepare my own fix. I will use the stable-6.3 build to fix the EMF Compare compatibility and switch to 6.4.0 when building my contribution to 2022-12. If it's not "early enough" I will leave my current version of EMF Compare in the M3 build... It's not working but it won't fail the release train build since I left the jgit/egit version ranges open so I accept 6.3.0 even if there will be a runtime failure using it. I would appreciate a ping as soon as your 6.4.0 M3 is available though.
I'll let you know here when 6.4.0-M3 is available
The JGit 6.4.0-M3 build is now available https://repo.eclipse.org/content/groups/releases/org/eclipse/jgit/org.eclipse.jgit.repository/6.4.0.202211160543-m3/ and here unzipped https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/org.eclipse.jgit.repository/6.4.0.202211160543-m3/org.eclipse.jgit.repository-6.4.0.202211160543-m3.zip-unzip/
Thank you, the fix for the RecursiveModelMerger on my end is ready, but for now I'm building with EGit 6.3.0 and JGit 6.3.1. Do you have an ETA on EGit 6.4.0-m3 consuming this new JGit?
EGit 6.4.0 M3 is now also available https://repo.eclipse.org/content/groups/releases/org/eclipse/egit/org.eclipse.egit.repository/6.4.0.202211160543-m3/ Here is the contribution to the simultaneous release: https://git.eclipse.org/r/c/simrel/org.eclipse.simrel.build/+/197026
Thanks! Building my own M3 now ;)
