Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » checkout with symlinks(I can't run git checkout when there are symlinks)
checkout with symlinks [message #1386634] Wed, 18 June 2014 18:38 Go to next message
Evan Thomas is currently offline Evan Thomas
Messages: 4
Registered: June 2014
Junior Member
Hi all. When I run the following command with sym links in my directory,
git.checkout().setName(branchName).call();

the call fails, and I get the error
Exception in thread "main" org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:

However when I run the same thing from the command line everything succeeds. Is there a work around for this?
Re: checkout with symlinks [message #1386734 is a reply to message #1386634] Thu, 19 June 2014 20:14 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 548
Registered: July 2009
Senior Member
Did you install the org.eclipse.jgit.java7 bundle ?
Re: checkout with symlinks [message #1386735 is a reply to message #1386734] Thu, 19 June 2014 20:16 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 548
Registered: July 2009
Senior Member
Did you check which pathes the checkout conflict is raised for ?
Call CheckoutConflictException.getConflictingPaths() for that.
Is any of the symlinks in this list ?
Re: checkout with symlinks [message #1386767 is a reply to message #1386634] Fri, 20 June 2014 06:26 Go to previous messageGo to next message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 317
Registered: July 2009
Senior Member
Evan Thomas skrev 2014-06-19 00.38:
> Hi all. When I run the following command with sym links in my directory,
> git.checkout().setName(branchName).call();
>
> the call fails, and I get the error
> Exception in thread "main" org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
> However when I run the same thing from the command line everything succeeds. Is there a work around for this?

Is that an empty list?

Which version are you using. 3.4.0 contains some fixes for conflict handling.

-- robin
Re: checkout with symlinks [message #1386812 is a reply to message #1386767] Fri, 20 June 2014 13:48 Go to previous messageGo to next message
Evan Thomas is currently offline Evan Thomas
Messages: 4
Registered: June 2014
Junior Member
I have a directory 'dir' with files 'dir/file1' and 'dir/file2'. I have a symlink 'link -> dir'. I called CheckoutConflictException.getConflictingPaths(), the exception is raised for 'link/file1' and 'link/file2' but not for 'link' (if I remove file1 and file 2 the exception disappears).

I'm on version 3.3.2, i'll upgrade and see if that fixes the problem
Re: checkout with symlinks [message #1386815 is a reply to message #1386812] Fri, 20 June 2014 13:54 Go to previous messageGo to next message
Evan Thomas is currently offline Evan Thomas
Messages: 4
Registered: June 2014
Junior Member
Upgrading to 3.4.0 did not fix the issue
Re: checkout with symlinks [message #1386823 is a reply to message #1386815] Fri, 20 June 2014 18:11 Go to previous messageGo to next message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 317
Registered: July 2009
Senior Member
Evan Thomas skrev 2014-06-20 19.54:
> Upgrading to 3.4.0 did not fix the issue

Can you create a small not-working repo, zip it and it's working directory (when checkout fails) and post it bugs.eclipse.org?
A single commit should be enough, I think.

-- robin
Re: checkout with symlinks [message #1386863 is a reply to message #1386734] Sat, 21 June 2014 16:50 Go to previous message
Robin Rosenberg is currently offline Robin Rosenberg
Messages: 317
Registered: July 2009
Senior Member
Matthias Sohn skrev 2014-06-20 02.14:
> Did you install the org.eclipse.jgit.java7 bundle ?

Apparently not

-- robin
Previous Topic:Fetch all remotes
Next Topic:Check Git connection
Goto Forum:
  


Current Time: Sat Aug 02 02:45:03 EDT 2014

Powered by FUDForum. Page generated in 0.02509 seconds