meanwhile there is a version 2.1 of the jgit library available. Are there any plans to upgrade. Netbeans uses V1.3.
Maybe some merging issues would disappear. I am often has problems merging using Netbeans while native Git works like a charm.
We'll upgrade when we have a reason to. Are you referring to any specific bug in JGit that you want to transplant to NetBeans? Please provide a link to them (https://bugs.eclipse.org/bugs/)
to be honest i am not a big fan of upgrading now. We're still quite happy with current version and i am a bit afraid the upgrade could break something.
I understand your concerns. Let me see if I could build a minimal example of what I mean. Maybe I am running into this eol "bug" of jgit using autocrlf=true on windows.
Is there a way that I can replace jgit and check its behaviour?
Regarding this autocrlf problem there is a notice in jgit 2.0 release infos: http://wiki.eclipse.org/JGit/New_and_Noteworthy/2.0
And this is one bug, that is quite annoying for me as a windows user:
> Is there a way that I can replace jgit and check its behaviour?
You can replace ide/modules/org-eclipse-jgit.jar with the 2.1 version and start the IDE with a fresh userdir (--userdir empty_userdir)
Sorry about the late reply.
I changed jgit to version 2.2 but there were API changes so I got
while pushing. Pulling and commit seems to work. Simple replacement is no solution.
Meanwhile pulling using Netbeans is nearly unuseable for us. We using GitK, TortoiseGIT or GIT from commandline to merge. These tools are doing the job. But I want to stick to one tool (Netbeans prefered ;)).
We are developing from Windows and Linux clients. So this linefeed problem is there. jGit V1.3 is not able to use autocrlf so we are getting mixed linefeeds in our repository.
I attached a problematic nb-configuration.xml merge conflict image snapshot. The files are identical except the linefeeds.
Created attachment 130567 [details]
Merge conflict. This file could be merged by jgit. It is only an example, that
there are mixed linefeeds. More complex merges could not be done in our
situation using jgit.
JGit 2.3 should be released soon, i will upgrade it in NB
Integrated into 'main-golden', will be available in build *201303112300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
User: Ondrej Vrabec <email@example.com>
Log: #221737 - JGit Version Upgrade to 2.3
upgrading to JGit 2.3.1
*** Bug 229550 has been marked as a duplicate of this bug. ***