Re: [pencil-code/pencil-code] 681180: remove bestow config

6 views
Skip to first unread message

Wladimir Lyra

unread,
Mar 19, 2020, 3:58:08 PM3/19/20
to pencil-co...@googlegroups.com
Hi all 

This file keeps giving problems, flipping between Intel and intel (lowercase or uppercase I), and interferes with pushes and pulls from github. Anyone experiencing the same issue? 


On Thu, Mar 19, 2020 at 12:46 PM Wladimir Lyra <nor...@github.com> wrote:
  Branch: refs/heads/master
  Home:   https://github.com/pencil-code/pencil-code
  Commit: 681180f8c1b174e6d168e3248ca4db2319cb38f3
      https://github.com/pencil-code/pencil-code/commit/681180f8c1b174e6d168e3248ca4db2319cb38f3
  Author: Wladimir Lyra <wladim...@gmail.com>
  Date:   2020-03-19 (Thu, 19 Mar 2020)

  Changed paths:
    R config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-intel.conf

  Log Message:
  -----------
  remove bestow config


  Commit: e3111c770d42e97fc9a23239d4d645de2939442c
      https://github.com/pencil-code/pencil-code/commit/e3111c770d42e97fc9a23239d4d645de2939442c
  Author: Wladimir Lyra <wladim...@gmail.com>
  Date:   2020-03-19 (Thu, 19 Mar 2020)

  Changed paths:
    R config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-Intel.conf

  Log Message:
  -----------
  delete beskow config file


Compare: https://github.com/pencil-code/pencil-code/compare/49c2adcc9a83...e3111c770d42

--
You received this message because you are subscribed to the Google Groups "pencil-code-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pencil-code-com...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/pencil-code-commits/pencil-code/pencil-code/push/refs/heads/master/49c2ad-e3111c%40github.com.

Wolfgang Dobler

unread,
Mar 19, 2020, 4:36:54 PM3/19/20
to pencil-co...@googlegroups.com
Hi Wlad,

Wladimir Lyra writes:
> This file keeps giving problems, flipping between Intel and intel
> (lowercase or uppercase I), and interferes with pushes and pulls from
> github. Anyone experiencing the same issue? 

The way I read the git logs

gitk --all --date-order -- config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-{i,I}ntel.conf

, the file has existed in both versions (intel and Intel) in parallel
since 4 Feb 2020. I.e. there were two files.


W o l f g a n g

Christer Sandin

unread,
Mar 19, 2020, 5:34:22 PM3/19/20
to pencil-co...@googlegroups.com
I created the file with the capital Intel, and have been using it ever since.
In fact, to use the Intel compiler and HDF5 files on SNIC/PDC/Beskow
one must use the approach in that file. And now you have removed it.

I could imagine that you have git push / pull issues because of stash / stash pop
mix ups?

So, is it OK if I add the file anew?

Christer
You received this message because you are subscribed to the Google Groups "pencil-code-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pencil-code-dis...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/pencil-code-discuss/CAMik5jy6va3f4CT2uR5Zvr0Th6nKpCDzFBP%2Btw4-zRJcturGng%40mail.gmail.com.

Wladimir Lyra

unread,
Mar 19, 2020, 5:43:36 PM3/19/20
to pencil-co...@googlegroups.com
>I could imagine that you have git push / pull issues because of stash / stash pop mix ups

It might as well be that's what's happening. It's an annoying thing 

git status -uno
modified config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-Intel.conf

when I haven't ever touched the file. When I do checkout 

git checkout config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-Intel.conf

it then modifies the lowercase 

git status -uno
modified config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-intel.conf

And it keeps going on this loop. You checkout the uppercase, it modifies the lowercase, and vice versa, not allowing pushes or pulls. 







Wolfgang Dobler

unread,
Mar 20, 2020, 1:22:42 AM3/20/20
to pencil-co...@googlegroups.com
Wladimir Lyra writes:
> >I could imagine that you have git push / pull issues because of stash / stash pop mix ups
>
> It might as well be that's what's happening. It's an annoying thing 
>
> git status -uno
> modified config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-Intel.conf
>
> when I haven't ever touched the file. When I do checkout 
>
> git checkout config/hosts/SNIC/PDC/host-beskow-login2.pdc.kth.se-Intel.conf
>
> it then modifies the lowercase 

So was there ever any reason to have both files?


None of you is on Mac OS-X or Windows, I hope?

Your Git version is >= 2.0.1?

https://stackoverflow.com/questions/10523849/changing-capitalization-of-filenames-in-git

Wladimir Lyra

unread,
Mar 20, 2020, 1:23:53 AM3/20/20
to pencil-co...@googlegroups.com
I’m on Mac OSX 

--
You received this message because you are subscribed to the Google Groups "pencil-code-discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email to pencil-code-dis...@googlegroups.com.

Christer Sandin

unread,
Mar 20, 2020, 3:16:26 AM3/20/20
to pencil-co...@googlegroups.com
Linux; Ubuntu 18.04, and whatever linux-flavor is used on Beskow (module system).




På fre, mars 2020 klockan 6:22, Wolfgang Dobler

Wolfgang Dobler

unread,
Mar 20, 2020, 5:31:28 AM3/20/20
to pencil-co...@googlegroups.com
Wladimir Lyra writes:
> I’m on Mac OSX 

That's the problem, then, together with the fact that there are, or have
been, both files in parallel, which still sounds wrong.
Things may be OK if both files are removed (as they are now), you update
to that state on the Mac, then one of the files gets reinstalled *on
Linux* (i.e. on a case-sensitive file system).


Bit given that this file is only useful on Beskow, would it be hard to
just refrain from touching it on the Mac and never have that problem
again?
Reply all
Reply to author
Forward
0 new messages