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

> Stephan
> 
> The protocol of my terminal session is as follows:
> 
> $ git checkout -f master
> Checking out files: 100% (3326/3326), done.
> Switched to branch 'master'
> Your branch is up to date with 'origin/master‘.
> $ git status
> On branch master
> Your branch is up to date with 'origin/master'.
> 
> nothing to commit, working tree clean
> 
> $ (cd development/cmake/modules ;ls -l)
> total 288
> -rw-r--r--  1 stephan  staff   3908 27 Dez  2018 FindASPELL.cmake
> -rw-r--r--  1 stephan  staff   1071 27 Dez  2018 FindAiksaurusLIB.cmake
> -rw-r--r--  1 stephan  staff   4233 27 Dez  2018 FindCXX11Compiler.cmake
> -rw-r--r--  1 stephan  staff    682 10 Feb 11:30 FindENCHANT.cmake
> -rw-r--r--  1 stephan  staff   1322 27 Dez  2018 FindGNUWIN32.cmake
> -rw-r--r--  1 stephan  staff    741 14 Feb 15:52 FindHunspell.cmake
> -rw-r--r--  1 stephan  staff   3891 14 Feb 15:52 FindICONV.cmake
> -rwxr-xr-x  1 stephan  staff   3239 27 Dez  2018 FindLyXGettext.cmake
> -rw-r--r--  1 stephan  staff   2516 27 Dez  2018 FindMagic.cmake
> -rw-r--r--  1 stephan  staff    777 27 Dez  2018 FindMyThesLIB.cmake
> -rw-r--r--  1 stephan  staff   4775 27 Dez  2018 FindOpenSSL.cmake
> -rw-r--r--  1 stephan  staff  38254 27 Dez  2018 FindQt4.cmake
> -rw-r--r--  1 stephan  staff   1418 27 Dez  2018 FindZLIB.cmake
> -rw-r--r--  1 stephan  staff   2801 27 Dez  2018 LyXDestinations.cmake
> -rw-r--r--  1 stephan  staff  14119 14 Feb 15:52 LyXMacros.cmake
> -rw-r--r--  1 stephan  staff   3830 22 Aug 16:32 LyXPaths.cmake
> -rw-r--r--  1 stephan  staff   2067 27 Dez  2018 LyXuic.cmake
> -rw-r--r--  1 stephan  staff    651 27 Dez  2018 MacroBoolTo01.cmake
> -rw-r--r--  1 stephan  staff  10691 27 Dez  2018 PCHSupport_26.cmake
> -rw-r--r--  1 stephan  staff   2144 27 Dez  2018 ProjectSourceGroup.cmake
> 
> ================
> $ git checkout -f 2.3.x
> Checking out files: 100% (3325/3325), done.
> Switched to branch '2.3.x'
> Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded.
>   (use "git pull" to update your local branch)
> $ git status
> On branch 2.3.x
> Your branch is behind 'origin/2.3.x' by 3 commits, and can be fast-forwarded.
>   (use "git pull" to update your local branch)
> 
> 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“)
> $ git pull --rebase
> Unstaged changes after reset:
> M     development/cmake/modules/FindHunspell.cmake

Here I use normally
        git fetch
        git stash clear
        git stash save --include-untracked
        git pull --rebase
        git stash pop

> 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?

        Kornel

Attachment: pgpmkbt1X_QUY.pgp
Description: Digitale Signatur von OpenPGP

-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel

Reply via email to