You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@netbeans.apache.org by Thomas Wolf <tj...@gmail.com> on 2018/01/31 15:47:05 UTC
Need help understanding NB error message on git commit
I'm on a defect branch and there have been lots of commits on our main
branch since I branched off. Since I'm nowhere near finishing my work on
the branch, I thought it might be a good time to merge changes from the
main branch into my defect branch. The merge went well - only one file had
a merge conflict ("SASSimulation.java") which I resolved. Everything
builds and functions as expected. But when I tried to commit everything to
my branch, NB throws up an error:
"Some files were renamed only by changing the case in their names. You
should use a command line client to commit this state, the Netbeans IDE
cannot handle it properly."
I can definitely try and use the 'git' commands (I'll have to figure out
which options :-), but what files is NB talking about? There's no list of
offending files. The "Commit Message" doesn't make much sense to me either
- it seems to still have the original merge conflict in SASSimulation.java
- which I resolved and which had nothing to do with the name of the file (I
highlighted the file in commit list just to point it out.)
Any help would be much appreciated.
Tom
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Oh and I also realized the my title isn't quite right: it's not on the GIT
commit that this error occurs - it's when I bring up the commit DIALOG.
The error message is already there before I ever try to hit the "Commit"
button on that dialog.
Tom
On Wed, Jan 31, 2018 at 3:49 PM, Thomas Wolf <tj...@gmail.com> wrote:
> Oh, I never mentioned: I'm on NB 8.2 from netbeans.org. Running Java
> 1.8.144 and git is at version 2.14.1.
> tom
>
>
> On Wed, Jan 31, 2018 at 3:47 PM, Thomas Wolf <tj...@gmail.com> wrote:
>
>> Hi Peter,
>> This is a pretty new machine. I'm on the latest macOS (10.13.2), and it
>> runs Apple's newest files system APFS. We created this repository some 9
>> months ago and I've done plenty of commits, pushes, pulls without problem.
>> The only time I've seen this message before is when I was on Windows 10 and
>> there was some case sensitivity problem. I've been on Mac for 3-4 months
>> without incident.
>>
>> This is the first time I'm merging in the opposite direction: I'm
>> merging from the main branch into a defect branch (that was branched off
>> the main branch a couple months ago). No idea whether that is relevant,
>> though.
>>
>> As I asked in my email from a moment ago, is there a way to put NB into a
>> more verbose mode with regards to its GIT operations? What actually
>> happens (git-wise) when you bring up the commit dialog?
>>
>> Thnx,
>> Tom
>>
>>
>> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld <pe...@gmx.de>
>> wrote:
>>
>>> Hello Tom,
>>>
>>> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
>>> Which file system does Your Mac use? I've found this on Wikipedia:
>>> https://en.wikipedia.org/wiki/HFS_Plus
>>>
>>> Especially this sentence might give a hint - or probably not:
>>> "Additionally, the core of the filesystem uses case-insensitive NFD <
>>> https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms> Unicode
>>> strings, which led Linus Torvalds <https://en.wikipedia.org/wiki
>>> /Linus_Torvalds> to say that "HFS+ is probably the worst file-system
>>> ever."
>>>
>>> Kind regards
>>> Peter
>>>
>>>
>>>
>>> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>>>
>>>> Hallo Peter,
>>>> I'm on a Mac (I'm guessing you ask because of the case sensitivity
>>>> issue with Windows?). The relevant parts of my gitconfig (it's quite
>>>> lengthy because of all the defect branches, so I'm not going to send the
>>>> whole thing):
>>>>
>>>> [core]
>>>> repositoryformatversion = 0
>>>> filemode = true
>>>> bare = false
>>>> logallrefupdates = true
>>>> ignorecase = true
>>>> precomposeunicode = true
>>>> [remote "origin"]
>>>> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>>>> fetch = +refs/heads/*:refs/remotes/origin/*
>>>> [branch "master"]
>>>> remote = origin
>>>> merge = refs/heads/master
>>>> [branch "dev-d5sim151"]
>>>> remote = origin
>>>> merge = refs/heads/dev-d5sim151
>>>> [pack]
>>>> buildbitmaps = false
>>>> [branch "S1385163"]
>>>> remote = origin
>>>> merge = refs/heads/S1385163
>>>>
>>>> I'm in the S1385163 branch and merged in our main branch dev-d5sim151.
>>>> I'm now trying to commit the merged changes into the S1385163.
>>>>
>>>>
>>>> Thanks for the links - I'll start reading, I guess. Just wish NB was a
>>>> little more forthcoming with what files are having this issue :-(
>>>>
>>>> Tschuess,
>>>> Thomas
>>>>
>>>>
>>>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <
>>>> peter.nabbefeld@gmx.de <ma...@gmx.de>> wrote:
>>>>
>>>> Hi Tom,
>>>>
>>>> are You on Windows? What is the content of Your git config?
>>>>
>>>> Probably these articles provide some helpful information for You:
>>>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>>>> -case-sensitive-only-filename-changes-in-git
>>>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>>>> t-case-sensitive-only-filename-changes-in-git>
>>>> https://stackoverflow.com/questions/52950/how-to-make-git-ig
>>>> nore-changes-in-case
>>>>
>>>> <https://stackoverflow.com/questions/52950/how-to-make-git-i
>>>> gnore-changes-in-case>
>>>>
>>>> Kind regards
>>>> Peter
>>>>
>>>>
>>>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>>>
>>>>
>>>> I'm on a defect branch and there have been lots of commits on
>>>> our main branch since I branched off. Since I'm nowhere near
>>>> finishing my work on the branch, I thought it might be a good
>>>> time to merge changes from the main branch into my defect
>>>> branch. The merge went well - only one file had a merge
>>>> conflict ("SASSimulation.java") which I resolved. Everything
>>>> builds and functions as expected. But when I tried to commit
>>>> everything to my branch, NB throws up an error:
>>>>
>>>> "Some files were renamed only by changing the case in their
>>>> names. You should use a command line client to commit this
>>>> state, the Netbeans IDE cannot handle it properly."
>>>>
>>>> I can definitely try and use the 'git' commands (I'll have to
>>>> figure out which options :-), but what files is NB talking
>>>> about? There's no list of offending files. The "Commit
>>>> Message" doesn't make much sense to me either - it seems to
>>>> still have the original merge conflict in SASSimulation.java -
>>>> which I resolved and which had nothing to do with the name of
>>>> the file (I highlighted the file in commit list just to point
>>>> it out.)
>>>>
>>>> Any help would be much appreciated.
>>>> Tom
>>>>
>>>>
>>>> -- tjwolf@gmail.com <ma...@gmail.com>
>>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>>>> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.co
>>>> m/>
>>>>
>>>>
>>>> ------------------------------------------------------------
>>>> ---------
>>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>>> <ma...@netbeans.apache.org>
>>>> For additional commands, e-mail:
>>>> users-help@netbeans.apache.org
>>>> <ma...@netbeans.apache.org>
>>>>
>>>> For further information about the NetBeans mailing lists, visit:
>>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>>>> +lists
>>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>>> g+lists>
>>>>
>>>>
>>>>
>>>> ------------------------------------------------------------
>>>> ---------
>>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>>> <ma...@netbeans.apache.org>
>>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>>> <ma...@netbeans.apache.org>
>>>>
>>>> For further information about the NetBeans mailing lists, visit:
>>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>> >
>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> tjwolf@gmail.com <ma...@gmail.com>
>>>> http://landofwolf.blogspot.com/
>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>
>>>
>>
>>
>> --
>> tjwolf@gmail.com
>> http://landofwolf.blogspot.com/
>>
>
>
>
> --
> tjwolf@gmail.com
> http://landofwolf.blogspot.com/
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Oh, I never mentioned: I'm on NB 8.2 from netbeans.org. Running Java
1.8.144 and git is at version 2.14.1.
tom
On Wed, Jan 31, 2018 at 3:47 PM, Thomas Wolf <tj...@gmail.com> wrote:
> Hi Peter,
> This is a pretty new machine. I'm on the latest macOS (10.13.2), and it
> runs Apple's newest files system APFS. We created this repository some 9
> months ago and I've done plenty of commits, pushes, pulls without problem.
> The only time I've seen this message before is when I was on Windows 10 and
> there was some case sensitivity problem. I've been on Mac for 3-4 months
> without incident.
>
> This is the first time I'm merging in the opposite direction: I'm merging
> from the main branch into a defect branch (that was branched off the main
> branch a couple months ago). No idea whether that is relevant, though.
>
> As I asked in my email from a moment ago, is there a way to put NB into a
> more verbose mode with regards to its GIT operations? What actually
> happens (git-wise) when you bring up the commit dialog?
>
> Thnx,
> Tom
>
>
> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld <pe...@gmx.de>
> wrote:
>
>> Hello Tom,
>>
>> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
>> Which file system does Your Mac use? I've found this on Wikipedia:
>> https://en.wikipedia.org/wiki/HFS_Plus
>>
>> Especially this sentence might give a hint - or probably not:
>> "Additionally, the core of the filesystem uses case-insensitive NFD <
>> https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms> Unicode
>> strings, which led Linus Torvalds <https://en.wikipedia.org/wiki
>> /Linus_Torvalds> to say that "HFS+ is probably the worst file-system
>> ever."
>>
>> Kind regards
>> Peter
>>
>>
>>
>> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>>
>>> Hallo Peter,
>>> I'm on a Mac (I'm guessing you ask because of the case sensitivity issue
>>> with Windows?). The relevant parts of my gitconfig (it's quite lengthy
>>> because of all the defect branches, so I'm not going to send the whole
>>> thing):
>>>
>>> [core]
>>> repositoryformatversion = 0
>>> filemode = true
>>> bare = false
>>> logallrefupdates = true
>>> ignorecase = true
>>> precomposeunicode = true
>>> [remote "origin"]
>>> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>>> fetch = +refs/heads/*:refs/remotes/origin/*
>>> [branch "master"]
>>> remote = origin
>>> merge = refs/heads/master
>>> [branch "dev-d5sim151"]
>>> remote = origin
>>> merge = refs/heads/dev-d5sim151
>>> [pack]
>>> buildbitmaps = false
>>> [branch "S1385163"]
>>> remote = origin
>>> merge = refs/heads/S1385163
>>>
>>> I'm in the S1385163 branch and merged in our main branch dev-d5sim151.
>>> I'm now trying to commit the merged changes into the S1385163.
>>>
>>>
>>> Thanks for the links - I'll start reading, I guess. Just wish NB was a
>>> little more forthcoming with what files are having this issue :-(
>>>
>>> Tschuess,
>>> Thomas
>>>
>>>
>>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <peter.nabbefeld@gmx.de
>>> <ma...@gmx.de>> wrote:
>>>
>>> Hi Tom,
>>>
>>> are You on Windows? What is the content of Your git config?
>>>
>>> Probably these articles provide some helpful information for You:
>>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>>> -case-sensitive-only-filename-changes-in-git
>>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>>> t-case-sensitive-only-filename-changes-in-git>
>>> https://stackoverflow.com/questions/52950/how-to-make-git-ig
>>> nore-changes-in-case
>>>
>>> <https://stackoverflow.com/questions/52950/how-to-make-git-i
>>> gnore-changes-in-case>
>>>
>>> Kind regards
>>> Peter
>>>
>>>
>>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>>
>>>
>>> I'm on a defect branch and there have been lots of commits on
>>> our main branch since I branched off. Since I'm nowhere near
>>> finishing my work on the branch, I thought it might be a good
>>> time to merge changes from the main branch into my defect
>>> branch. The merge went well - only one file had a merge
>>> conflict ("SASSimulation.java") which I resolved. Everything
>>> builds and functions as expected. But when I tried to commit
>>> everything to my branch, NB throws up an error:
>>>
>>> "Some files were renamed only by changing the case in their
>>> names. You should use a command line client to commit this
>>> state, the Netbeans IDE cannot handle it properly."
>>>
>>> I can definitely try and use the 'git' commands (I'll have to
>>> figure out which options :-), but what files is NB talking
>>> about? There's no list of offending files. The "Commit
>>> Message" doesn't make much sense to me either - it seems to
>>> still have the original merge conflict in SASSimulation.java -
>>> which I resolved and which had nothing to do with the name of
>>> the file (I highlighted the file in commit list just to point
>>> it out.)
>>>
>>> Any help would be much appreciated.
>>> Tom
>>>
>>>
>>> -- tjwolf@gmail.com <ma...@gmail.com>
>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>>> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/
>>> >
>>>
>>>
>>> ------------------------------------------------------------
>>> ---------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> For additional commands, e-mail:
>>> users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>>> +lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists>
>>>
>>>
>>>
>>> ------------------------------------------------------------
>>> ---------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>>>
>>>
>>>
>>>
>>> --
>>> tjwolf@gmail.com <ma...@gmail.com>
>>> http://landofwolf.blogspot.com/
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: users-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>
>
> --
> tjwolf@gmail.com
> http://landofwolf.blogspot.com/
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Peter Nabbefeld <pe...@gmx.de>.
Hi Tom,
at this point You'd really better use the Git Bash. I had a similar hell
using Eclipse, even loosing some changes - the IDEs can provide only
limited support, as they usually still rely on git itself, filtering
some "spam" usually not interesting.
If You're in an unusual situation, e.g. because of some non-working
configuration, it's better to use the console, as You now need the
"spam" as debugging information.
"git status" may help, however, You can usually also get help with e.g.
"git help merge".
Kind regards
Peter
Am 01.02.2018 um 17:22 schrieb Thomas Wolf:
> Ok, what the he11 just happened. I did a "Revert Modifications" to
> undo the merge in my defect branch, but now NB shows the word "Merged"
> in the version label next to the project - no matter which branch I
> switch to subsequently??? See attached screen shot. Is this a NB bug
> or something I did wrong? Thinking that it might be a bug, I exited
> NB and deleted its Cache. But no change. Any suggestions would be
> much appreciated. I hope I didn't scramble my local repository :-(
>
> Thnx,
> tom
>
> On Thu, Feb 1, 2018 at 10:46 AM, Thomas Wolf <tjwolf@gmail.com
> <ma...@gmail.com>> wrote:
>
> Hi Peter,
> The remote repository server is Linux based. It's maintained by a
> different group, so I don't have access to their git config file.
> I think at this point I will revert the merge and do as you
> suggest: simply find the file name diffs - easy enough to do with
> 'find'. Thanks.
>
> Maybe I will file a bug in Jira as John suggested (would be my
> first in the new bug tracking system :-)
>
>
> Tom
>
> On Thu, Feb 1, 2018 at 12:57 AM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de <ma...@gmx.de>> wrote:
>
> Hi Tom,
>
> if Your repository has been created before moving to Mac, this
> might cause problems. I don't know, what "ignorecase = true"
> actually does - it's not in my git config. From reading, it
> seems to just suppress checks on diffferent case, so shouldn't
> hurt too much.
>
> Did You check the config on Your remote repository? Sorry, I
> don't know, how the NB git module actually works, but just in
> case NB first does some compatibility checks ...
>
> Did You check case in both branches? Probably somebody else
> changed the filename by accident?
>
> Which OS is Your remote running?
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 21:47 schrieb Thomas Wolf:
>
> Hi Peter,
> This is a pretty new machine. I'm on the latest macOS
> (10.13.2), and it runs Apple's newest files system APFS.
> We created this repository some 9 months ago and I've done
> plenty of commits, pushes, pulls without problem. The
> only time I've seen this message before is when I was on
> Windows 10 and there was some case sensitivity problem.
> I've been on Mac for 3-4 months without incident.
>
> This is the first time I'm merging in the opposite
> direction: I'm merging from the main branch into a defect
> branch (that was branched off the main branch a couple
> months ago). No idea whether that is relevant, though.
>
> As I asked in my email from a moment ago, is there a way
> to put NB into a more verbose mode with regards to its GIT
> operations? What actually happens (git-wise) when you
> bring up the commit dialog?
>
> Thnx,
> Tom
>
>
> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de <ma...@gmx.de>
> <mailto:peter.nabbefeld@gmx.de
> <ma...@gmx.de>>> wrote:
>
> Hello Tom,
>
> sorry, but I don't have a Mac, so I cannot reproduce
> Your issue.
> Which file system does Your Mac use? I've found this
> on Wikipedia:
> https://en.wikipedia.org/wiki/HFS_Plus
> <https://en.wikipedia.org/wiki/HFS_Plus>
> <https://en.wikipedia.org/wiki/HFS_Plus
> <https://en.wikipedia.org/wiki/HFS_Plus>>
>
> Especially this sentence might give a hint - or
> probably not:
> "Additionally, the core of the filesystem uses
> case-insensitive
> NFD
>
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms>
>
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms>>>
> Unicode strings, which led Linus Torvalds
> <https://en.wikipedia.org/wiki/Linus_Torvalds
> <https://en.wikipedia.org/wiki/Linus_Torvalds>
> <https://en.wikipedia.org/wiki/Linus_Torvalds
> <https://en.wikipedia.org/wiki/Linus_Torvalds>>> to say
> that "HFS+
> is probably the worst file-system ever."
>
> Kind regards
> Peter
>
>
>
> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>
> Hallo Peter,
> I'm on a Mac (I'm guessing you ask because of the case
> sensitivity issue with Windows?). The relevant
> parts of my
> gitconfig (it's quite lengthy because of all the
> defect
> branches, so I'm not going to send the whole thing):
>
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> ignorecase = true
> precomposeunicode = true
> [remote "origin"]
> url =
>
> git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [branch "dev-d5sim151"]
> remote = origin
> merge = refs/heads/dev-d5sim151
> [pack]
> buildbitmaps = false
> [branch "S1385163"]
> remote = origin
> merge = refs/heads/S1385163
>
> I'm in the S1385163 branch and merged in our main
> branch
> dev-d5sim151. I'm now trying to commit the merged
> changes
> into the S1385163.
>
>
> Thanks for the links - I'll start reading, I
> guess. Just wish
> NB was a little more forthcoming with what files
> are having
> this issue :-(
>
> Tschuess,
> Thomas
>
>
> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de
> <ma...@gmx.de>
> <mailto:peter.nabbefeld@gmx.de
> <ma...@gmx.de>>
> <mailto:peter.nabbefeld@gmx.de
> <ma...@gmx.de>
>
> <mailto:peter.nabbefeld@gmx.de
> <ma...@gmx.de>>>> wrote:
>
> Hi Tom,
>
> are You on Windows? What is the content of
> Your git config?
>
> Probably these articles provide some helpful
> information
> for You:
> https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>
>
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>>
>
>
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>
>
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>>>
> https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>
>
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>>
>
>
>
>
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>
>
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>>>
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>
>
> I'm on a defect branch and there have been
> lots of
> commits on
> our main branch since I branched off.
> Since I'm
> nowhere near
> finishing my work on the branch, I thought
> it might be
> a good
> time to merge changes from the main branch
> into my defect
> branch. The merge went well - only one
> file had a merge
> conflict ("SASSimulation.java") which I
> resolved.
> Everything
> builds and functions as expected. But
> when I tried to
> commit
> everything to my branch, NB throws up an
> error:
>
> "Some files were renamed only by changing
> the case in
> their
> names. You should use a command line
> client to commit
> this
> state, the Netbeans IDE cannot handle it
> properly."
>
> I can definitely try and use the 'git'
> commands (I'll
> have to
> figure out which options :-), but what
> files is NB talking
> about? There's no list of offending
> files. The "Commit
> Message" doesn't make much sense to me
> either - it
> seems to
> still have the original merge conflict in
> SASSimulation.java -
> which I resolved and which had nothing to
> do with the
> name of
> the file (I highlighted the file in commit
> list just
> to point
> it out.)
>
> Any help would be much appreciated.
> Tom
>
>
> -- tjwolf@gmail.com
> <ma...@gmail.com> <mailto:tjwolf@gmail.com
> <ma...@gmail.com>>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>
> <mailto:tjwolf@gmail.com
> <ma...@gmail.com> <mailto:tjwolf@gmail.com
> <ma...@gmail.com>>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>>
> http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>
> <http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>>
> <http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>
> <http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>>>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>
>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>>
>
> For further information about the NetBeans
> mailing
> lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>
>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>>
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>>
>
> For further information about the NetBeans
> mailing lists,
> visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>
>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>>
>
>
>
>
> -- tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>
> http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>
> <http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>
>
> For further information about the NetBeans mailing
> lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
> http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> http://landofwolf.blogspot.com/
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: users-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
For additional commands, e-mail: users-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Ok, what the he11 just happened. I did a "Revert Modifications" to undo
the merge in my defect branch, but now NB shows the word "Merged" in the
version label next to the project - no matter which branch I switch to
subsequently??? See attached screen shot. Is this a NB bug or something I
did wrong? Thinking that it might be a bug, I exited NB and deleted its
Cache. But no change. Any suggestions would be much appreciated. I hope
I didn't scramble my local repository :-(
Thnx,
tom
On Thu, Feb 1, 2018 at 10:46 AM, Thomas Wolf <tj...@gmail.com> wrote:
> Hi Peter,
> The remote repository server is Linux based. It's maintained by a
> different group, so I don't have access to their git config file. I think
> at this point I will revert the merge and do as you suggest: simply find
> the file name diffs - easy enough to do with 'find'. Thanks.
>
> Maybe I will file a bug in Jira as John suggested (would be my first in
> the new bug tracking system :-)
>
>
> Tom
>
> On Thu, Feb 1, 2018 at 12:57 AM, Peter Nabbefeld <pe...@gmx.de>
> wrote:
>
>> Hi Tom,
>>
>> if Your repository has been created before moving to Mac, this might
>> cause problems. I don't know, what "ignorecase = true" actually does - it's
>> not in my git config. From reading, it seems to just suppress checks on
>> diffferent case, so shouldn't hurt too much.
>>
>> Did You check the config on Your remote repository? Sorry, I don't know,
>> how the NB git module actually works, but just in case NB first does some
>> compatibility checks ...
>>
>> Did You check case in both branches? Probably somebody else changed the
>> filename by accident?
>>
>> Which OS is Your remote running?
>>
>> Kind regards
>> Peter
>>
>>
>> Am 31.01.2018 um 21:47 schrieb Thomas Wolf:
>>
>>> Hi Peter,
>>> This is a pretty new machine. I'm on the latest macOS (10.13.2), and it
>>> runs Apple's newest files system APFS. We created this repository some 9
>>> months ago and I've done plenty of commits, pushes, pulls without problem.
>>> The only time I've seen this message before is when I was on Windows 10 and
>>> there was some case sensitivity problem. I've been on Mac for 3-4 months
>>> without incident.
>>>
>>> This is the first time I'm merging in the opposite direction: I'm
>>> merging from the main branch into a defect branch (that was branched off
>>> the main branch a couple months ago). No idea whether that is relevant,
>>> though.
>>>
>>> As I asked in my email from a moment ago, is there a way to put NB into
>>> a more verbose mode with regards to its GIT operations? What actually
>>> happens (git-wise) when you bring up the commit dialog?
>>>
>>> Thnx,
>>> Tom
>>>
>>>
>>> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld <peter.nabbefeld@gmx.de
>>> <ma...@gmx.de>> wrote:
>>>
>>> Hello Tom,
>>>
>>> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
>>> Which file system does Your Mac use? I've found this on Wikipedia:
>>> https://en.wikipedia.org/wiki/HFS_Plus
>>> <https://en.wikipedia.org/wiki/HFS_Plus>
>>>
>>> Especially this sentence might give a hint - or probably not:
>>> "Additionally, the core of the filesystem uses case-insensitive
>>> NFD
>>> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms
>>> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms>>
>>> Unicode strings, which led Linus Torvalds
>>> <https://en.wikipedia.org/wiki/Linus_Torvalds
>>> <https://en.wikipedia.org/wiki/Linus_Torvalds>> to say that "HFS+
>>> is probably the worst file-system ever."
>>>
>>> Kind regards
>>> Peter
>>>
>>>
>>>
>>> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>>>
>>> Hallo Peter,
>>> I'm on a Mac (I'm guessing you ask because of the case
>>> sensitivity issue with Windows?). The relevant parts of my
>>> gitconfig (it's quite lengthy because of all the defect
>>> branches, so I'm not going to send the whole thing):
>>>
>>> [core]
>>> repositoryformatversion = 0
>>> filemode = true
>>> bare = false
>>> logallrefupdates = true
>>> ignorecase = true
>>> precomposeunicode = true
>>> [remote "origin"]
>>> url =
>>> git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>>> fetch = +refs/heads/*:refs/remotes/origin/*
>>> [branch "master"]
>>> remote = origin
>>> merge = refs/heads/master
>>> [branch "dev-d5sim151"]
>>> remote = origin
>>> merge = refs/heads/dev-d5sim151
>>> [pack]
>>> buildbitmaps = false
>>> [branch "S1385163"]
>>> remote = origin
>>> merge = refs/heads/S1385163
>>>
>>> I'm in the S1385163 branch and merged in our main branch
>>> dev-d5sim151. I'm now trying to commit the merged changes
>>> into the S1385163.
>>>
>>>
>>> Thanks for the links - I'll start reading, I guess. Just wish
>>> NB was a little more forthcoming with what files are having
>>> this issue :-(
>>>
>>> Tschuess,
>>> Thomas
>>>
>>>
>>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld
>>> <peter.nabbefeld@gmx.de <ma...@gmx.de>
>>> <mailto:peter.nabbefeld@gmx.de
>>>
>>> <ma...@gmx.de>>> wrote:
>>>
>>> Hi Tom,
>>>
>>> are You on Windows? What is the content of Your git config?
>>>
>>> Probably these articles provide some helpful information
>>> for You:
>>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>>> -case-sensitive-only-filename-changes-in-git
>>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>>> t-case-sensitive-only-filename-changes-in-git>
>>>
>>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>>> t-case-sensitive-only-filename-changes-in-git
>>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>>> t-case-sensitive-only-filename-changes-in-git>>
>>> https://stackoverflow.com/questions/52950/how-to-make-git-ig
>>> nore-changes-in-case
>>> <https://stackoverflow.com/questions/52950/how-to-make-git-i
>>> gnore-changes-in-case>
>>>
>>>
>>>
>>> <https://stackoverflow.com/questions/52950/how-to-make-git-i
>>> gnore-changes-in-case
>>> <https://stackoverflow.com/questions/52950/how-to-make-git-i
>>> gnore-changes-in-case>>
>>>
>>> Kind regards
>>> Peter
>>>
>>>
>>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>>
>>>
>>> I'm on a defect branch and there have been lots of
>>> commits on
>>> our main branch since I branched off. Since I'm
>>> nowhere near
>>> finishing my work on the branch, I thought it might be
>>> a good
>>> time to merge changes from the main branch into my defect
>>> branch. The merge went well - only one file had a merge
>>> conflict ("SASSimulation.java") which I resolved.
>>> Everything
>>> builds and functions as expected. But when I tried to
>>> commit
>>> everything to my branch, NB throws up an error:
>>>
>>> "Some files were renamed only by changing the case in
>>> their
>>> names. You should use a command line client to commit
>>> this
>>> state, the Netbeans IDE cannot handle it properly."
>>>
>>> I can definitely try and use the 'git' commands (I'll
>>> have to
>>> figure out which options :-), but what files is NB
>>> talking
>>> about? There's no list of offending files. The "Commit
>>> Message" doesn't make much sense to me either - it
>>> seems to
>>> still have the original merge conflict in
>>> SASSimulation.java -
>>> which I resolved and which had nothing to do with the
>>> name of
>>> the file (I highlighted the file in commit list just
>>> to point
>>> it out.)
>>>
>>> Any help would be much appreciated.
>>> Tom
>>>
>>>
>>> -- tjwolf@gmail.com <ma...@gmail.com>
>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>
>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>
>>> http://landofwolf.blogspot.com/
>>> <http://landofwolf.blogspot.com/>
>>> <http://landofwolf.blogspot.com/
>>> <http://landofwolf.blogspot.com/>>
>>>
>>>
>>>
>>> ------------------------------------------------------------
>>> ---------
>>> To unsubscribe, e-mail:
>>> users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> <mailto:users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>>
>>> For additional commands, e-mail:
>>> users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> <mailto:users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>>
>>>
>>> For further information about the NetBeans mailing
>>> lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>>> +lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists>
>>>
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists>>
>>>
>>>
>>>
>>>
>>> ------------------------------------------------------------
>>> ---------
>>> To unsubscribe, e-mail:
>>> users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> <mailto:users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>>
>>> For additional commands, e-mail:
>>> users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> <mailto:users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>>
>>>
>>> For further information about the NetBeans mailing lists,
>>> visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>>> +lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists>
>>>
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>>> g+lists>>
>>>
>>>
>>>
>>>
>>> -- tjwolf@gmail.com <ma...@gmail.com>
>>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>>> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/
>>> >
>>>
>>>
>>>
>>> ------------------------------------------------------------
>>> ---------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>> <ma...@netbeans.apache.org>
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>>>
>>>
>>>
>>>
>>> --
>>> tjwolf@gmail.com <ma...@gmail.com>
>>> http://landofwolf.blogspot.com/
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: users-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>
>
> --
> tjwolf@gmail.com
> http://landofwolf.blogspot.com/
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Hi Peter,
The remote repository server is Linux based. It's maintained by a
different group, so I don't have access to their git config file. I think
at this point I will revert the merge and do as you suggest: simply find
the file name diffs - easy enough to do with 'find'. Thanks.
Maybe I will file a bug in Jira as John suggested (would be my first in the
new bug tracking system :-)
Tom
On Thu, Feb 1, 2018 at 12:57 AM, Peter Nabbefeld <pe...@gmx.de>
wrote:
> Hi Tom,
>
> if Your repository has been created before moving to Mac, this might cause
> problems. I don't know, what "ignorecase = true" actually does - it's not
> in my git config. From reading, it seems to just suppress checks on
> diffferent case, so shouldn't hurt too much.
>
> Did You check the config on Your remote repository? Sorry, I don't know,
> how the NB git module actually works, but just in case NB first does some
> compatibility checks ...
>
> Did You check case in both branches? Probably somebody else changed the
> filename by accident?
>
> Which OS is Your remote running?
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 21:47 schrieb Thomas Wolf:
>
>> Hi Peter,
>> This is a pretty new machine. I'm on the latest macOS (10.13.2), and it
>> runs Apple's newest files system APFS. We created this repository some 9
>> months ago and I've done plenty of commits, pushes, pulls without problem.
>> The only time I've seen this message before is when I was on Windows 10 and
>> there was some case sensitivity problem. I've been on Mac for 3-4 months
>> without incident.
>>
>> This is the first time I'm merging in the opposite direction: I'm
>> merging from the main branch into a defect branch (that was branched off
>> the main branch a couple months ago). No idea whether that is relevant,
>> though.
>>
>> As I asked in my email from a moment ago, is there a way to put NB into a
>> more verbose mode with regards to its GIT operations? What actually
>> happens (git-wise) when you bring up the commit dialog?
>>
>> Thnx,
>> Tom
>>
>>
>> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld <peter.nabbefeld@gmx.de
>> <ma...@gmx.de>> wrote:
>>
>> Hello Tom,
>>
>> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
>> Which file system does Your Mac use? I've found this on Wikipedia:
>> https://en.wikipedia.org/wiki/HFS_Plus
>> <https://en.wikipedia.org/wiki/HFS_Plus>
>>
>> Especially this sentence might give a hint - or probably not:
>> "Additionally, the core of the filesystem uses case-insensitive
>> NFD
>> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms
>> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms>>
>> Unicode strings, which led Linus Torvalds
>> <https://en.wikipedia.org/wiki/Linus_Torvalds
>> <https://en.wikipedia.org/wiki/Linus_Torvalds>> to say that "HFS+
>> is probably the worst file-system ever."
>>
>> Kind regards
>> Peter
>>
>>
>>
>> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>>
>> Hallo Peter,
>> I'm on a Mac (I'm guessing you ask because of the case
>> sensitivity issue with Windows?). The relevant parts of my
>> gitconfig (it's quite lengthy because of all the defect
>> branches, so I'm not going to send the whole thing):
>>
>> [core]
>> repositoryformatversion = 0
>> filemode = true
>> bare = false
>> logallrefupdates = true
>> ignorecase = true
>> precomposeunicode = true
>> [remote "origin"]
>> url =
>> git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>> [branch "dev-d5sim151"]
>> remote = origin
>> merge = refs/heads/dev-d5sim151
>> [pack]
>> buildbitmaps = false
>> [branch "S1385163"]
>> remote = origin
>> merge = refs/heads/S1385163
>>
>> I'm in the S1385163 branch and merged in our main branch
>> dev-d5sim151. I'm now trying to commit the merged changes
>> into the S1385163.
>>
>>
>> Thanks for the links - I'll start reading, I guess. Just wish
>> NB was a little more forthcoming with what files are having
>> this issue :-(
>>
>> Tschuess,
>> Thomas
>>
>>
>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld
>> <peter.nabbefeld@gmx.de <ma...@gmx.de>
>> <mailto:peter.nabbefeld@gmx.de
>>
>> <ma...@gmx.de>>> wrote:
>>
>> Hi Tom,
>>
>> are You on Windows? What is the content of Your git config?
>>
>> Probably these articles provide some helpful information
>> for You:
>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>> -case-sensitive-only-filename-changes-in-git
>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>> t-case-sensitive-only-filename-changes-in-git>
>>
>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>> t-case-sensitive-only-filename-changes-in-git
>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>> t-case-sensitive-only-filename-changes-in-git>>
>> https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case
>> <https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case>
>>
>>
>>
>> <https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case
>> <https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case>>
>>
>> Kind regards
>> Peter
>>
>>
>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>
>>
>> I'm on a defect branch and there have been lots of
>> commits on
>> our main branch since I branched off. Since I'm
>> nowhere near
>> finishing my work on the branch, I thought it might be
>> a good
>> time to merge changes from the main branch into my defect
>> branch. The merge went well - only one file had a merge
>> conflict ("SASSimulation.java") which I resolved.
>> Everything
>> builds and functions as expected. But when I tried to
>> commit
>> everything to my branch, NB throws up an error:
>>
>> "Some files were renamed only by changing the case in
>> their
>> names. You should use a command line client to commit
>> this
>> state, the Netbeans IDE cannot handle it properly."
>>
>> I can definitely try and use the 'git' commands (I'll
>> have to
>> figure out which options :-), but what files is NB talking
>> about? There's no list of offending files. The "Commit
>> Message" doesn't make much sense to me either - it
>> seems to
>> still have the original merge conflict in
>> SASSimulation.java -
>> which I resolved and which had nothing to do with the
>> name of
>> the file (I highlighted the file in commit list just
>> to point
>> it out.)
>>
>> Any help would be much appreciated.
>> Tom
>>
>>
>> -- tjwolf@gmail.com <ma...@gmail.com>
>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>> <mailto:tjwolf@gmail.com <ma...@gmail.com>
>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>
>> http://landofwolf.blogspot.com/
>> <http://landofwolf.blogspot.com/>
>> <http://landofwolf.blogspot.com/
>> <http://landofwolf.blogspot.com/>>
>>
>>
>>
>> ------------------------------------------------------------
>> ---------
>> To unsubscribe, e-mail:
>> users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> <mailto:users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>>
>> For additional commands, e-mail:
>> users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> <mailto:users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>>
>>
>> For further information about the NetBeans mailing
>> lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>> +lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists>
>>
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists>>
>>
>>
>>
>>
>> ------------------------------------------------------------
>> ---------
>> To unsubscribe, e-mail:
>> users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> <mailto:users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>>
>> For additional commands, e-mail:
>> users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> <mailto:users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>>
>>
>> For further information about the NetBeans mailing lists,
>> visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>> +lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists>
>>
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists>>
>>
>>
>>
>>
>> -- tjwolf@gmail.com <ma...@gmail.com>
>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> For additional commands, e-mail: users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>>
>>
>>
>>
>> --
>> tjwolf@gmail.com <ma...@gmail.com>
>> http://landofwolf.blogspot.com/
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: users-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Peter Nabbefeld <pe...@gmx.de>.
Hi Tom,
if Your repository has been created before moving to Mac, this might
cause problems. I don't know, what "ignorecase = true" actually does -
it's not in my git config. From reading, it seems to just suppress
checks on diffferent case, so shouldn't hurt too much.
Did You check the config on Your remote repository? Sorry, I don't know,
how the NB git module actually works, but just in case NB first does
some compatibility checks ...
Did You check case in both branches? Probably somebody else changed the
filename by accident?
Which OS is Your remote running?
Kind regards
Peter
Am 31.01.2018 um 21:47 schrieb Thomas Wolf:
> Hi Peter,
> This is a pretty new machine. I'm on the latest macOS (10.13.2), and
> it runs Apple's newest files system APFS. We created this repository
> some 9 months ago and I've done plenty of commits, pushes, pulls
> without problem. The only time I've seen this message before is when
> I was on Windows 10 and there was some case sensitivity problem. I've
> been on Mac for 3-4 months without incident.
>
> This is the first time I'm merging in the opposite direction: I'm
> merging from the main branch into a defect branch (that was branched
> off the main branch a couple months ago). No idea whether that is
> relevant, though.
>
> As I asked in my email from a moment ago, is there a way to put NB
> into a more verbose mode with regards to its GIT operations? What
> actually happens (git-wise) when you bring up the commit dialog?
>
> Thnx,
> Tom
>
>
> On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de <ma...@gmx.de>> wrote:
>
> Hello Tom,
>
> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
> Which file system does Your Mac use? I've found this on Wikipedia:
> https://en.wikipedia.org/wiki/HFS_Plus
> <https://en.wikipedia.org/wiki/HFS_Plus>
>
> Especially this sentence might give a hint - or probably not:
> "Additionally, the core of the filesystem uses case-insensitive
> NFD
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms
> <https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms>>
> Unicode strings, which led Linus Torvalds
> <https://en.wikipedia.org/wiki/Linus_Torvalds
> <https://en.wikipedia.org/wiki/Linus_Torvalds>> to say that "HFS+
> is probably the worst file-system ever."
>
> Kind regards
> Peter
>
>
>
> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>
> Hallo Peter,
> I'm on a Mac (I'm guessing you ask because of the case
> sensitivity issue with Windows?). The relevant parts of my
> gitconfig (it's quite lengthy because of all the defect
> branches, so I'm not going to send the whole thing):
>
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> ignorecase = true
> precomposeunicode = true
> [remote "origin"]
> url =
> git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [branch "dev-d5sim151"]
> remote = origin
> merge = refs/heads/dev-d5sim151
> [pack]
> buildbitmaps = false
> [branch "S1385163"]
> remote = origin
> merge = refs/heads/S1385163
>
> I'm in the S1385163 branch and merged in our main branch
> dev-d5sim151. I'm now trying to commit the merged changes
> into the S1385163.
>
>
> Thanks for the links - I'll start reading, I guess. Just wish
> NB was a little more forthcoming with what files are having
> this issue :-(
>
> Tschuess,
> Thomas
>
>
> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de <ma...@gmx.de>
> <mailto:peter.nabbefeld@gmx.de
> <ma...@gmx.de>>> wrote:
>
> Hi Tom,
>
> are You on Windows? What is the content of Your git config?
>
> Probably these articles provide some helpful information
> for You:
> https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>
>
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>>
> https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>
>
>
>
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>>
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>
>
> I'm on a defect branch and there have been lots of
> commits on
> our main branch since I branched off. Since I'm
> nowhere near
> finishing my work on the branch, I thought it might be
> a good
> time to merge changes from the main branch into my defect
> branch. The merge went well - only one file had a merge
> conflict ("SASSimulation.java") which I resolved.
> Everything
> builds and functions as expected. But when I tried to
> commit
> everything to my branch, NB throws up an error:
>
> "Some files were renamed only by changing the case in
> their
> names. You should use a command line client to commit
> this
> state, the Netbeans IDE cannot handle it properly."
>
> I can definitely try and use the 'git' commands (I'll
> have to
> figure out which options :-), but what files is NB talking
> about? There's no list of offending files. The "Commit
> Message" doesn't make much sense to me either - it
> seems to
> still have the original merge conflict in
> SASSimulation.java -
> which I resolved and which had nothing to do with the
> name of
> the file (I highlighted the file in commit list just
> to point
> it out.)
>
> Any help would be much appreciated.
> Tom
>
>
> -- tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>>
> http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>
> <http://landofwolf.blogspot.com/
> <http://landofwolf.blogspot.com/>>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>
>
> For further information about the NetBeans mailing
> lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
> <mailto:users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>>
>
> For further information about the NetBeans mailing lists,
> visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> For additional commands, e-mail: users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> http://landofwolf.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
For additional commands, e-mail: users-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Hi Peter,
This is a pretty new machine. I'm on the latest macOS (10.13.2), and it
runs Apple's newest files system APFS. We created this repository some 9
months ago and I've done plenty of commits, pushes, pulls without problem.
The only time I've seen this message before is when I was on Windows 10 and
there was some case sensitivity problem. I've been on Mac for 3-4 months
without incident.
This is the first time I'm merging in the opposite direction: I'm merging
from the main branch into a defect branch (that was branched off the main
branch a couple months ago). No idea whether that is relevant, though.
As I asked in my email from a moment ago, is there a way to put NB into a
more verbose mode with regards to its GIT operations? What actually
happens (git-wise) when you bring up the commit dialog?
Thnx,
Tom
On Wed, Jan 31, 2018 at 3:12 PM, Peter Nabbefeld <pe...@gmx.de>
wrote:
> Hello Tom,
>
> sorry, but I don't have a Mac, so I cannot reproduce Your issue.
> Which file system does Your Mac use? I've found this on Wikipedia:
> https://en.wikipedia.org/wiki/HFS_Plus
>
> Especially this sentence might give a hint - or probably not:
> "Additionally, the core of the filesystem uses case-insensitive NFD <
> https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms> Unicode
> strings, which led Linus Torvalds <https://en.wikipedia.org/wiki
> /Linus_Torvalds> to say that "HFS+ is probably the worst file-system
> ever."
>
> Kind regards
> Peter
>
>
>
> Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
>
>> Hallo Peter,
>> I'm on a Mac (I'm guessing you ask because of the case sensitivity issue
>> with Windows?). The relevant parts of my gitconfig (it's quite lengthy
>> because of all the defect branches, so I'm not going to send the whole
>> thing):
>>
>> [core]
>> repositoryformatversion = 0
>> filemode = true
>> bare = false
>> logallrefupdates = true
>> ignorecase = true
>> precomposeunicode = true
>> [remote "origin"]
>> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>> [branch "dev-d5sim151"]
>> remote = origin
>> merge = refs/heads/dev-d5sim151
>> [pack]
>> buildbitmaps = false
>> [branch "S1385163"]
>> remote = origin
>> merge = refs/heads/S1385163
>>
>> I'm in the S1385163 branch and merged in our main branch dev-d5sim151.
>> I'm now trying to commit the merged changes into the S1385163.
>>
>>
>> Thanks for the links - I'll start reading, I guess. Just wish NB was a
>> little more forthcoming with what files are having this issue :-(
>>
>> Tschuess,
>> Thomas
>>
>>
>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <peter.nabbefeld@gmx.de
>> <ma...@gmx.de>> wrote:
>>
>> Hi Tom,
>>
>> are You on Windows? What is the content of Your git config?
>>
>> Probably these articles provide some helpful information for You:
>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>> -case-sensitive-only-filename-changes-in-git
>> <https://stackoverflow.com/questions/17683458/how-do-i-commi
>> t-case-sensitive-only-filename-changes-in-git>
>> https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case
>>
>> <https://stackoverflow.com/questions/52950/how-to-make-git-
>> ignore-changes-in-case>
>>
>> Kind regards
>> Peter
>>
>>
>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>
>>
>> I'm on a defect branch and there have been lots of commits on
>> our main branch since I branched off. Since I'm nowhere near
>> finishing my work on the branch, I thought it might be a good
>> time to merge changes from the main branch into my defect
>> branch. The merge went well - only one file had a merge
>> conflict ("SASSimulation.java") which I resolved. Everything
>> builds and functions as expected. But when I tried to commit
>> everything to my branch, NB throws up an error:
>>
>> "Some files were renamed only by changing the case in their
>> names. You should use a command line client to commit this
>> state, the Netbeans IDE cannot handle it properly."
>>
>> I can definitely try and use the 'git' commands (I'll have to
>> figure out which options :-), but what files is NB talking
>> about? There's no list of offending files. The "Commit
>> Message" doesn't make much sense to me either - it seems to
>> still have the original merge conflict in SASSimulation.java -
>> which I resolved and which had nothing to do with the name of
>> the file (I highlighted the file in commit list just to point
>> it out.)
>>
>> Any help would be much appreciated.
>> Tom
>>
>>
>> -- tjwolf@gmail.com <ma...@gmail.com>
>> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
>> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/>
>>
>>
>> ------------------------------------------------------------
>> ---------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> For additional commands, e-mail:
>> users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing
>> +lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailin
>> g+lists>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>> For additional commands, e-mail: users-help@netbeans.apache.org
>> <ma...@netbeans.apache.org>
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>>
>>
>>
>>
>> --
>> tjwolf@gmail.com <ma...@gmail.com>
>> http://landofwolf.blogspot.com/
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: users-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Peter Nabbefeld <pe...@gmx.de>.
Hello Tom,
sorry, but I don't have a Mac, so I cannot reproduce Your issue.
Which file system does Your Mac use? I've found this on Wikipedia:
https://en.wikipedia.org/wiki/HFS_Plus
Especially this sentence might give a hint - or probably not:
"Additionally, the core of the filesystem uses case-insensitive NFD
<https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms> Unicode
strings, which led Linus Torvalds
<https://en.wikipedia.org/wiki/Linus_Torvalds> to say that "HFS+ is
probably the worst file-system ever."
Kind regards
Peter
Am 31.01.2018 um 20:36 schrieb Thomas Wolf:
> Hallo Peter,
> I'm on a Mac (I'm guessing you ask because of the case sensitivity
> issue with Windows?). The relevant parts of my gitconfig (it's quite
> lengthy because of all the defect branches, so I'm not going to send
> the whole thing):
>
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> ignorecase = true
> precomposeunicode = true
> [remote "origin"]
> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [branch "dev-d5sim151"]
> remote = origin
> merge = refs/heads/dev-d5sim151
> [pack]
> buildbitmaps = false
> [branch "S1385163"]
> remote = origin
> merge = refs/heads/S1385163
>
> I'm in the S1385163 branch and merged in our main branch
> dev-d5sim151. I'm now trying to commit the merged changes into the
> S1385163.
>
>
> Thanks for the links - I'll start reading, I guess. Just wish NB was
> a little more forthcoming with what files are having this issue :-(
>
> Tschuess,
> Thomas
>
>
> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld
> <peter.nabbefeld@gmx.de <ma...@gmx.de>> wrote:
>
> Hi Tom,
>
> are You on Windows? What is the content of Your git config?
>
> Probably these articles provide some helpful information for You:
> https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
> <https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git>
> https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
> <https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case>
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>
>
> I'm on a defect branch and there have been lots of commits on
> our main branch since I branched off. Since I'm nowhere near
> finishing my work on the branch, I thought it might be a good
> time to merge changes from the main branch into my defect
> branch. The merge went well - only one file had a merge
> conflict ("SASSimulation.java") which I resolved. Everything
> builds and functions as expected. But when I tried to commit
> everything to my branch, NB throws up an error:
>
> "Some files were renamed only by changing the case in their
> names. You should use a command line client to commit this
> state, the Netbeans IDE cannot handle it properly."
>
> I can definitely try and use the 'git' commands (I'll have to
> figure out which options :-), but what files is NB talking
> about? There's no list of offending files. The "Commit
> Message" doesn't make much sense to me either - it seems to
> still have the original merge conflict in SASSimulation.java -
> which I resolved and which had nothing to do with the name of
> the file (I highlighted the file in commit list just to point
> it out.)
>
> Any help would be much appreciated.
> Tom
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> <mailto:tjwolf@gmail.com <ma...@gmail.com>>
> http://landofwolf.blogspot.com/ <http://landofwolf.blogspot.com/>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> For additional commands, e-mail:
> users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> <ma...@netbeans.apache.org>
> For additional commands, e-mail: users-help@netbeans.apache.org
> <ma...@netbeans.apache.org>
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
> <https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists>
>
>
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> http://landofwolf.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
For additional commands, e-mail: users-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
John, what do you think I'm trying to do by asking? :-) I have no idea
what files NB is complaining about - my commit after the merge included
dozens of files (many of them data files, not source code). I checked the
IDE log and don't see any messages at all when I right-click
Project->Git->Commit. I was hoping that may there I'd see the files that
have the naming issue - no luck :-(
Next, I'll try exiting, removing all the caches, and monitor the IDE log as
soon as I start the IDE - maybe something obvious wills how up there.
Is there a way to make the IDE's git output more verbose?
tom
On Wed, Jan 31, 2018 at 2:43 PM, John McDonnell <mc...@gmail.com>
wrote:
> Thomas,
>
> If you can narrow down the issue, and solve it, maybe file a defect in
> JIRA, your scenario/investigation might help someone that works on that
> defect.
>
>
> Regards
>
> John
>
> On 31 January 2018 at 19:36, Thomas Wolf <tj...@gmail.com> wrote:
>
>> Hallo Peter,
>> I'm on a Mac (I'm guessing you ask because of the case sensitivity issue
>> with Windows?). The relevant parts of my gitconfig (it's quite lengthy
>> because of all the defect branches, so I'm not going to send the whole
>> thing):
>>
>> [core]
>> repositoryformatversion = 0
>> filemode = true
>> bare = false
>> logallrefupdates = true
>> ignorecase = true
>> precomposeunicode = true
>> [remote "origin"]
>> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
>> fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>> remote = origin
>> merge = refs/heads/master
>> [branch "dev-d5sim151"]
>> remote = origin
>> merge = refs/heads/dev-d5sim151
>> [pack]
>> buildbitmaps = false
>> [branch "S1385163"]
>> remote = origin
>> merge = refs/heads/S1385163
>>
>> I'm in the S1385163 branch and merged in our main branch dev-d5sim151.
>> I'm now trying to commit the merged changes into the S1385163.
>>
>>
>> Thanks for the links - I'll start reading, I guess. Just wish NB was a
>> little more forthcoming with what files are having this issue :-(
>>
>> Tschuess,
>> Thomas
>>
>>
>> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <pe...@gmx.de>
>> wrote:
>>
>>> Hi Tom,
>>>
>>> are You on Windows? What is the content of Your git config?
>>>
>>> Probably these articles provide some helpful information for You:
>>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>>> -case-sensitive-only-filename-changes-in-git
>>> https://stackoverflow.com/questions/52950/how-to-make-git-ig
>>> nore-changes-in-case
>>>
>>> Kind regards
>>> Peter
>>>
>>>
>>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>>
>>>>
>>>> I'm on a defect branch and there have been lots of commits on our main
>>>> branch since I branched off. Since I'm nowhere near finishing my work on
>>>> the branch, I thought it might be a good time to merge changes from the
>>>> main branch into my defect branch. The merge went well - only one file had
>>>> a merge conflict ("SASSimulation.java") which I resolved. Everything
>>>> builds and functions as expected. But when I tried to commit everything to
>>>> my branch, NB throws up an error:
>>>>
>>>> "Some files were renamed only by changing the case in their names. You
>>>> should use a command line client to commit this state, the Netbeans IDE
>>>> cannot handle it properly."
>>>>
>>>> I can definitely try and use the 'git' commands (I'll have to figure
>>>> out which options :-), but what files is NB talking about? There's no list
>>>> of offending files. The "Commit Message" doesn't make much sense to me
>>>> either - it seems to still have the original merge conflict in
>>>> SASSimulation.java - which I resolved and which had nothing to do with the
>>>> name of the file (I highlighted the file in commit list just to point it
>>>> out.)
>>>>
>>>> Any help would be much appreciated.
>>>> Tom
>>>>
>>>>
>>>> --
>>>> tjwolf@gmail.com <ma...@gmail.com>
>>>> http://landofwolf.blogspot.com/
>>>>
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>>>
>>>> For further information about the NetBeans mailing lists, visit:
>>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>
>>>
>>
>>
>> --
>> tjwolf@gmail.com
>> http://landofwolf.blogspot.com/
>>
>
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by John McDonnell <mc...@gmail.com>.
Thomas,
If you can narrow down the issue, and solve it, maybe file a defect in
JIRA, your scenario/investigation might help someone that works on that
defect.
Regards
John
On 31 January 2018 at 19:36, Thomas Wolf <tj...@gmail.com> wrote:
> Hallo Peter,
> I'm on a Mac (I'm guessing you ask because of the case sensitivity issue
> with Windows?). The relevant parts of my gitconfig (it's quite lengthy
> because of all the defect branches, so I'm not going to send the whole
> thing):
>
> [core]
> repositoryformatversion = 0
> filemode = true
> bare = false
> logallrefupdates = true
> ignorecase = true
> precomposeunicode = true
> [remote "origin"]
> url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
> fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> remote = origin
> merge = refs/heads/master
> [branch "dev-d5sim151"]
> remote = origin
> merge = refs/heads/dev-d5sim151
> [pack]
> buildbitmaps = false
> [branch "S1385163"]
> remote = origin
> merge = refs/heads/S1385163
>
> I'm in the S1385163 branch and merged in our main branch dev-d5sim151.
> I'm now trying to commit the merged changes into the S1385163.
>
>
> Thanks for the links - I'll start reading, I guess. Just wish NB was a
> little more forthcoming with what files are having this issue :-(
>
> Tschuess,
> Thomas
>
>
> On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <pe...@gmx.de>
> wrote:
>
>> Hi Tom,
>>
>> are You on Windows? What is the content of Your git config?
>>
>> Probably these articles provide some helpful information for You:
>> https://stackoverflow.com/questions/17683458/how-do-i-commit
>> -case-sensitive-only-filename-changes-in-git
>> https://stackoverflow.com/questions/52950/how-to-make-git-ig
>> nore-changes-in-case
>>
>> Kind regards
>> Peter
>>
>>
>> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>>
>>>
>>> I'm on a defect branch and there have been lots of commits on our main
>>> branch since I branched off. Since I'm nowhere near finishing my work on
>>> the branch, I thought it might be a good time to merge changes from the
>>> main branch into my defect branch. The merge went well - only one file had
>>> a merge conflict ("SASSimulation.java") which I resolved. Everything
>>> builds and functions as expected. But when I tried to commit everything to
>>> my branch, NB throws up an error:
>>>
>>> "Some files were renamed only by changing the case in their names. You
>>> should use a command line client to commit this state, the Netbeans IDE
>>> cannot handle it properly."
>>>
>>> I can definitely try and use the 'git' commands (I'll have to figure out
>>> which options :-), but what files is NB talking about? There's no list of
>>> offending files. The "Commit Message" doesn't make much sense to me either
>>> - it seems to still have the original merge conflict in SASSimulation.java
>>> - which I resolved and which had nothing to do with the name of the file (I
>>> highlighted the file in commit list just to point it out.)
>>>
>>> Any help would be much appreciated.
>>> Tom
>>>
>>>
>>> --
>>> tjwolf@gmail.com <ma...@gmail.com>
>>> http://landofwolf.blogspot.com/
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>>> For additional commands, e-mail: users-help@netbeans.apache.org
>>>
>>> For further information about the NetBeans mailing lists, visit:
>>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: users-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>
>
> --
> tjwolf@gmail.com
> http://landofwolf.blogspot.com/
>
Re: Need help understanding NB error message on git commit
Posted by Thomas Wolf <tj...@gmail.com>.
Hallo Peter,
I'm on a Mac (I'm guessing you ask because of the case sensitivity issue
with Windows?). The relevant parts of my gitconfig (it's quite lengthy
because of all the defect branches, so I'm not going to send the whole
thing):
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
ignorecase = true
precomposeunicode = true
[remote "origin"]
url = git@gitgrid.unx.sas.com:Vertical/SimulationStudio/DesktopApp
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "dev-d5sim151"]
remote = origin
merge = refs/heads/dev-d5sim151
[pack]
buildbitmaps = false
[branch "S1385163"]
remote = origin
merge = refs/heads/S1385163
I'm in the S1385163 branch and merged in our main branch dev-d5sim151. I'm
now trying to commit the merged changes into the S1385163.
Thanks for the links - I'll start reading, I guess. Just wish NB was a
little more forthcoming with what files are having this issue :-(
Tschuess,
Thomas
On Wed, Jan 31, 2018 at 1:40 PM, Peter Nabbefeld <pe...@gmx.de>
wrote:
> Hi Tom,
>
> are You on Windows? What is the content of Your git config?
>
> Probably these articles provide some helpful information for You:
> https://stackoverflow.com/questions/17683458/how-do-i-commit
> -case-sensitive-only-filename-changes-in-git
> https://stackoverflow.com/questions/52950/how-to-make-git-
> ignore-changes-in-case
>
> Kind regards
> Peter
>
>
> Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>
>>
>> I'm on a defect branch and there have been lots of commits on our main
>> branch since I branched off. Since I'm nowhere near finishing my work on
>> the branch, I thought it might be a good time to merge changes from the
>> main branch into my defect branch. The merge went well - only one file had
>> a merge conflict ("SASSimulation.java") which I resolved. Everything
>> builds and functions as expected. But when I tried to commit everything to
>> my branch, NB throws up an error:
>>
>> "Some files were renamed only by changing the case in their names. You
>> should use a command line client to commit this state, the Netbeans IDE
>> cannot handle it properly."
>>
>> I can definitely try and use the 'git' commands (I'll have to figure out
>> which options :-), but what files is NB talking about? There's no list of
>> offending files. The "Commit Message" doesn't make much sense to me either
>> - it seems to still have the original merge conflict in SASSimulation.java
>> - which I resolved and which had nothing to do with the name of the file (I
>> highlighted the file in commit list just to point it out.)
>>
>> Any help would be much appreciated.
>> Tom
>>
>>
>> --
>> tjwolf@gmail.com <ma...@gmail.com>
>> http://landofwolf.blogspot.com/
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: users-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: users-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
--
tjwolf@gmail.com
http://landofwolf.blogspot.com/
Re: Need help understanding NB error message on git commit
Posted by Peter Nabbefeld <pe...@gmx.de>.
Hi Tom,
are You on Windows? What is the content of Your git config?
Probably these articles provide some helpful information for You:
https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git
https://stackoverflow.com/questions/52950/how-to-make-git-ignore-changes-in-case
Kind regards
Peter
Am 31.01.2018 um 16:47 schrieb Thomas Wolf:
>
> I'm on a defect branch and there have been lots of commits on our main
> branch since I branched off. Since I'm nowhere near finishing my work
> on the branch, I thought it might be a good time to merge changes from
> the main branch into my defect branch. The merge went well - only one
> file had a merge conflict ("SASSimulation.java") which I resolved.
> Everything builds and functions as expected. But when I tried to
> commit everything to my branch, NB throws up an error:
>
> "Some files were renamed only by changing the case in their names.
> You should use a command line client to commit this state, the
> Netbeans IDE cannot handle it properly."
>
> I can definitely try and use the 'git' commands (I'll have to figure
> out which options :-), but what files is NB talking about? There's no
> list of offending files. The "Commit Message" doesn't make much sense
> to me either - it seems to still have the original merge conflict in
> SASSimulation.java - which I resolved and which had nothing to do with
> the name of the file (I highlighted the file in commit list just to
> point it out.)
>
> Any help would be much appreciated.
> Tom
>
>
> --
> tjwolf@gmail.com <ma...@gmail.com>
> http://landofwolf.blogspot.com/
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: users-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@netbeans.apache.org
For additional commands, e-mail: users-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists