Marten,
The commit log that you are listing is from the GsDevKit_home
project (and over the weekend I merged some work that was on the
issue_299 branch where I was working updating the
CHROME_DRIVER_VERSION used by seaside tests and that accounts for
the new commits you are seeing).
The repository that was not updating correctly is the glass
project ($GS_HOME/shared/repos/glass), so you should be comparing
the `git log` in that project with the list of commits up on
github[1] ... because that is where the bugfixes you need to be
able to build a tODE image with createStone ...
WAIT, I see now that you sent me the results from doing the git
commands that I suggested in $GS_HOME and not from
$GS_HOME/shared/repos/glass, ... sorry I didn't notice the
difference ... I was skimming over the German and didn't notice
that you were in the wrong repository... the key data points for
me was that the repo was on github and I assumed that `Bereits
aktuel` meant "already up to date" ...
So we've had our wires crossed here multiple times ...
Moving forward:
- Keep in mind that have two new commits (on December 5) that
I'm waiting for you to review before merging[2] ...
- please review the code and let me know if it matches what you
were thinking
- wait for me to merge the code into the master branch
- after I've done the merge, run these commands
cd $GS_HOME/shared/repos/glass
git pull origin master
git log -6
and we'll go from there ... the list of commits you see should
match the list of commits on github[1]:
Dale
[1]
https://github.com/glassdb/glass/commits/master
[2]
https://github.com/glassdb/glass/commit/0226e549a0c43181587525212cf8bfbbff6ea331#commitcomment-44837643
On 12/8/20 5:35 AM, Marten Feldtmann
wrote:
Hello Dale,
today I made a git pull and a git -6 and I got new content.
Here are the git log output - see the "hole" between 24.11 and
5.12. - so I assume, that the error of not getting your stuff is
a totally different one.
mf@mf-HP-ZBook-17-G2:~/GsDevKit_home$ git log -6
commit b3a9faf7a6ae9fdae6b6d406b2faca4fe09bbab4 (HEAD -> master, origin/master, origin/issue_299, origin/HEAD)
Author: Dale Henrichs [hidden email]
Date: Sun Dec 6 11:53:16 2020 -0800
add 'GS_VERSION=2.4.8 TEST=BasicB' to expected failures (2.4.8 slipping away)
commit ad10a65963d3768eb03c295b6c3c696cbcf95dc7
Author: Dale Henrichs [hidden email]
Date: Sun Dec 6 08:10:32 2020 -0800
upgrades from 3.2.x are not supported by 3.6.0
commit 1dbb152d091fa1b71fa4852a677f75425942879e
Author: Dale Henrichs [hidden email]
Date: Sat Dec 5 10:34:30 2020 -0800
Issue #299: Chrome-Driver 87.0.4280.88 is the correct version to use for now ... restore the full lineup
commit 7b431f5794be6a3090e0a91eec5f6456b45dc759
Author: Dale Henrichs [hidden email]
Date: Sat Dec 5 09:47:09 2020 -0800
see if Chrome-Driver 87.0.4280.88 is the ticket to success
commit cf3dd111fb62246cd27d5a9ce520f498a1e248d6
Author: Dale Henrichs [hidden email]
Date: Tue Nov 24 15:50:19 2020 -0800
cut down line up to just seaside tests and cat the chrome and selenium logs after the test is finished
commit 96495d6dc7b83eb511a11fc2b2777e88e68b24d4
Author: Dale Henrichs [hidden email]
Date: Tue Nov 24 09:11:33 2020 -0800
no travis keyfile needed for 3.6
Marten,
According to "google" this is not necessarily an uncommon
problem[1]. There are several different solutions that appear
to depend upon the particulars of your problem ... I suggest
you look at each of the solution before picking one to try ...
Dale
[1] https://stackoverflow.com/questions/20581914/files-not-updating-using-git-pull
On 12/2/20 6:28 PM, Dale Henrichs
wrote:
I don't see the output for git log -2 after the git pull
...
Dale
On 12/2/20 1:08 PM, Marten
Feldtmann wrote:
mf@mf-HP-ZBook-17-G2:~/GsDevKit_home$ git remote -v
origin https://github.com/GsDevKit/GsDevKit_home.git (fetch)
origin https://github.com/GsDevKit/GsDevKit_home.git (push)
git status
Auf Branch master
Ihr Branch ist auf demselben Stand wie 'origin/master'.
Unversionierte Dateien:
(benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)
Obx/
deb.oberon.org.gpg.key
output.txt
st
updateGsDevKit.log
upgrade_1.log
nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien
(benutzen Sie "git add" zum Versionieren)
mf@mf-HP-ZBook-17-G2:~/GsDevKit_home$ git pull origin master
Von https://github.com/GsDevKit/GsDevKit_home
* branch master -> FETCH_HEAD
Bereits aktuell.
So, thats i my output ... seems to be all ok.
Marten
Run these four commands and send me the output so I can
try to understand why you are not able to get the newer
commits:
git remote -v
git status
git pull origin master
git log -2
Dale
_______________________________________________
Glass mailing list
[hidden email]
https://lists.gemtalksystems.com/mailman/listinfo/glass
Locked
