Am 14.02.2020 um 17:22 schrieb Stephan Witt <st.w...@gmx.net>:
>
> Am 14.02.2020 um 16:44 schrieb Kornel Benko <kor...@lyx.org>:
>>
>> Am Fri, 14 Feb 2020 15:57:45 +0100
>> schrieb Stephan Witt <st.w...@gmx.net>:
>>
>>> Am 08.02.2020 um 21:55 schrieb Kornel Benko <kor...@lyx.org>:
>>>>
>>>> commit a47dec6b4a91ca59a8d9d4431ecedd77f8ffc7e7
>>>> Author: Kornel Benko <kor...@lyx.org>
>>>> Date: Mon Jan 27 10:44:14 2020 +0100
>>>>
>>>> Cmake build: Remove cmake warnings about mismatched values of
>>>> FindPackageHandleStandardArgs()
>>>>
>>>> (cherry picked from commit 9fdc00fe2a2b2db752ca244eac3d14e708d5caba)
>>>> ---
>>>> CMakeLists.txt | 2 +-
>>>> development/cmake/modules/FindENCHANT.cmake | 22 ++++++++++++++++++++++
>>>> development/cmake/modules/FindHUNSPELL.cmake | 21 +++++++++++++++++++++
>>>> 3 files changed, 44 insertions(+), 1 deletions(-)
>>>
>>> Hi Kornel,
>>>
>>> I don’t know how this goes on Windows. But on Mac this breaks for checkouts
>>> in file systems with case insensitive file names. At least I have problems
>>> to switch between master and 2.3.x branch now.
>>>
>>> I don’t know how to proceed. Do you have an idea?
>>
>> I use a 'git clone'-dir for 2.3.x
That’s the protocol of a clean clone process:
==================
$ git clone g...@git.lyx.org:lyx lyx-2.3.x
Cloning into 'lyx-2.3.x'...
remote: Counting objects: 459413, done.
remote: Compressing objects: 100% (73785/73785), done.
remote: Total 459413 (delta 386809), reused 456042 (delta 383995)
Receiving objects: 100% (459413/459413), 428.32 MiB | 3.66 MiB/s, done.
Resolving deltas: 100% (386809/386809), done.
Checking out files: 100% (7263/7263), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:
'development/cmake/modules/FindENCHANT.cmake'
'development/cmake/modules/FindEnchant.cmake'
'development/cmake/modules/FindHUNSPELL.cmake'
'development/cmake/modules/FindHunspell.cmake'
$ (cd lyx-2.3.x;git checkout 2.3.x)
Checking out files: 100% (3325/3325), done.
Branch '2.3.x' set up to track remote branch '2.3.x' from 'origin'.
Switched to a new branch '2.3.x'
$ (cd lyx-2.3.x;git status)
On branch 2.3.x
Your branch is up to date with 'origin/2.3.x'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: development/cmake/modules/FindHUNSPELL.cmake
no changes added to commit (use "git add" and/or "git commit -a“)
==================
No luck. I’d guess on Windows with case insensitive FS it’s the same.
Stephan
>
> I have a separate checkout too. But there it is the same.
>
>> Here I use normally
>> git fetch
>> git stash clear
>> git stash save --include-untracked
>> git pull --rebase
>> git stash pop
>
> Normally I don’t like to loose my stash.
>
>>
>>> error: cannot pull with rebase: You have unstaged changes.
>>> error: please commit or stash them.
>>>
>>> $ (cd development/cmake/modules ;ls -l )
>>> total 288
>>
>> Does this help?
>
> No. Unfortunately not.
>
> Stephan
>
> --
> lyx-devel mailing list
> lyx-devel@lists.lyx.org
> http://lists.lyx.org/mailman/listinfo/lyx-devel
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
