Eclipse Community Forums: Oomph » CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2

Home » Eclipse Projects » Oomph » CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2(Same checkout works with 2022-12 M1)

Show: Today's Messages :: Show Polls :: Message Navigator

CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856119]

Tue, 22 November 2022 13:23

Arthur van Dorp

Messages: 48
Registered: October 2015

Member

Hi all
Since several years we use the more or less same Oomph setup for Eclipse Scout: https://git.eclipse.org/c/scout/oomph.git/plain/Scout.setup
The Scout Demo App-Project doesn't work when using 2022-12 M2 or M3, but works with M1, even when checking out M2 or M3. It gives up with "java.lang.Exception: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:".
The only possibly relevant changes I have found are https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/commit/?id=c5fdcc3d56a47b5df2394c9060b812e1c07b0007 and https://git.eclipse.org/c/jgit/jgit.git/commit/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java?id=f71fcbf36b9f9e21f8b796a0b2ea8226818e4780.
The installed Oomph Setup Git Plugin ist built at the same version timestamp as the oomph commit, indicating it should have it included (assuming the version timestamp uses the timestamp of the latest commit).
Simply checking out the repo with JGit (not via oomphs GitSetupTask) works.
Any ideas?
index.php/fa/42731/0/

Attachment: M2OomphDepsAfterScoutDemo.png
(Size: 48.68KB, Downloaded 163 times)
Attachment: M2CheckoutJGit.log
(Size: 23.59KB, Downloaded 40 times)

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856138 is a reply to message #1856119]

Tue, 22 November 2022 16:24

Ed Merks

Messages: 33145
Registered: July 2009

Senior Member

I can reproduce that. Importing the created clone manually shows it has a local branch for release/10.0 but I don't know why. I'll try to reproduce in a workspace where I can easily debug. I'd suggest opening a bugzilla to track the progress on the fix.

Ed Merks
Professional Support: https://www.macromodeling.com/

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856140 is a reply to message #1856138]

Tue, 22 November 2022 16:37

Ed Merks

Messages: 33145
Registered: July 2009

Senior Member

One thing I wonder though, it's trying to check out branch releases/22.x but I don't see such a branch. Is that a recent change?

Ed Merks
Professional Support: https://www.macromodeling.com/

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856141 is a reply to message #1856140]

Tue, 22 November 2022 17:02

Ed Merks

Messages: 33145
Registered: July 2009

Senior Member

With the fix I'm trying (setting the branch on the JGit clone command), but it fails like this because the branch you specify doesn't exist:

Cloning Git repo https://git.eclipse.org/r/scout/org.eclipse.scout.rt to D:\Users\test17\scout-releases-22-x2\git\org.eclipse.scout.rt
java.lang.Exception: org.eclipse.jgit.api.errors.TransportException: Remote branch 'releases/22.x' not found in upstream origin
  at org.eclipse.oomph.setup.git.impl.GitCloneTaskImpl.perform(GitCloneTaskImpl.java:974)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer.doPerformNeededSetupTasks(SetupTaskPerformer.java:3864)
  at org.eclipse.oomph.setup.internal.core.SetupTaskPerformer$WorkspaceUtil$1.run(SetupTaskPerformer.java:5200)

Ed Merks
Professional Support: https://www.macromodeling.com/

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856146 is a reply to message #1856141]

Wed, 23 November 2022 08:37

Arthur van Dorp

Messages: 48
Registered: October 2015

Member

Thank you for answering so quickly! I definitely should clean up old releases from the Oomph file. It should checkout features/version/22.0.37 from https://github.com/bsi-software/org.eclipse.scout.docs.git when using the settings as in the following screenshot.
index.php/fa/42734/0/

Attachment: NsZFGipROw.png
(Size: 22.92KB, Downloaded 137 times)

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856150 is a reply to message #1856146]

Wed, 23 November 2022 10:10

Ed Merks

Messages: 33145
Registered: July 2009

Senior Member

The fix is in a nightly build. I'll do a milestone build today for RC1. If you use a nightly installer from here it will install a nightly build of Oomph so you could test to verify the fix now, before the RC1 build later today:

https://download.eclipse.org/justj/?file=oomph/products/latest

Ed Merks
Professional Support: https://www.macromodeling.com/

Report message to a moderator

Re: CheckoutConflictException in Oomph GitCloneTask since 2022-12 M2 [message #1856152 is a reply to message #1856150]

Wed, 23 November 2022 12:33

Arthur van Dorp

Messages: 48
Registered: October 2015

Member

Thanks a lot. I've tested it by adding the oomph.setup.git plugin from https://download.eclipse.org/oomph/drops/nightly/N20221122-230028/plugins/ to the dropins folder of an M3 eclipse and deselecting the P2 director step in the Oomph import. Works flawlessly.

Report message to a moderator

Previous Topic:	Setup Tasks preference page missing
Next Topic:	Eclipse installation in Computer Lab

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Wed May 08 00:44:53 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter