On 06/01/2021 10:53, Claude Frantz wrote:
On 1/6/21 11:38 AM, Bill Somerville wrote:
Hi Bill,
I am not sure what has happened, but that directory contains a
CMakeLists.txt file in both the master branch and the
wsjtx-2.3.0-rc3 tag. Looks like something has gone wrong with your
local clone of the WSJT-X repository. What does this print:
git -C ~/ham/JoeTaylor/wsjtx status
Here is the output:
$ git -C ~/ham/JoeTaylor/wsjtx status
On branch master
Your branch is up to date with 'origin/master'.
You are in the middle of an am session.
(fix conflicts and then run "git am --continue")
(use "git am --skip" to skip this patch)
(use "git am --abort" to restore the original branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working
directory)
modified: CMakeLists.txt
deleted: debian/CMakeLists.txt
deleted: debian/changelog.in
deleted: debian/copyright.in
Untracked files:
(use "git add <file>..." to include in what will be committed)
HamlibTransceiver.hpp.orig
User_Guide_FOP.pdf
build/
doc/user_guide/en/install-linux.pdf
doc/user_guide/en/install-mac.pdf
doc/user_guide/en/my_Makefile
doc/user_guide/en/settings-frequencies.pdf
doc/user_guide/en/wsjtx-main.xml
doc/user_guide/en/wsjtx-main_via_docpdf.pdf
doc/user_guide/en/wsjtx-main_via_pandoc.pdf
no changes added to commit (use "git add" and/or "git commit -a")
Best wishes,
Claude (DJ0OT)
Hi Claude,
so that shows you have deleted the files in the debian sub-directory,
was that by accident or deliberate?
73
Bill
G4WJS.
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
