On 27.01.22 00:35, gene heskett wrote:
On Wednesday, January 26, 2022 5:22:10 PM EST Steffen Möller wrote:
Seems like you have done something to your git repository and it cannot
just go and fetch the newer version. It could be that these are just
some changes that have been made during the build (don't think so,
should not happen) but ... you can investigate this later. "git
status" would tell what is modified.
git status returns:
=======================
pi@rpi4:/media/pi/workspace/linuxcnc-dev $ git status
On branch master-gtk3
Your branch is up to date with 'origin/master-gtk3'.
nothing to commit, working tree clean
=======================
I personally like "git config
pull.rebase true" which puts local changes in the perspective of the
latest release.
And returns nothing here.
You were just configuring a default behaviour for git. It's fine. The
warning will not be triggered since there is nothing, yet.
To get the build done, I suggest to prepend to your script something
alike
if [ -d linuxcnc-dev ]; then
d=$(date -R)
echo "I: Removing previous repository of linuxcnc-dev to
'linuxcnc-dev-$d'"
mv linuxcnc-dev "linuxcnc-dev-$d"
fi
mkdir linuxcnc-dev
so everything is clean - you do not run that script too often, I
presume.
As often as its run. that would fill that 240gig drive in about a year.
:)
Well, I did not think straight. Please remove the "mkdir". Instead do
git clone https://github.com/LinuxCNC/linuxcnc.git linuxcnc-dev
so you have a fully functional git repository again.
git checkout master-gtk3
Seems like we found the culprit.
Please check https://github.com/LinuxCNC/linuxcnc/tree/master-gtk3/debian
and find this lacking all the recent developments from master.
When you "checkout" a branch you get all the files in the version they
have last been edited in that branch. That you have a past in the master
branch from the line above the git system does not remember, i.e. no
updates are transferred to that other branch. It is context-free. I
suggest to remove that second checkout from your cron file and just
checkout the true master branch and stay in it.
Cheers,
Steffen
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
