On Wed, 23 Oct 2019, Simon Peyton Jones via ghc-devs wrote:
Aieee! All my GHC repos are failing with this. As a result I can’t pull.
What
should I do? Thanks!
git remote prune origin___
ghc-devs mailing list
ghc-devs@haskell.org
Thanks everyone!
From: ghc-devs On Behalf Of Bryan Richter
Sent: 23 October 2019 17:36
To: GHC developers
Subject: Re: Urgent: git problem
I suspect a git fetch --prune might help. It looks like git's mapping of remote
branches to a directory tree has caused a conflict between new and stale
Ah, good to know there's a command *just* for pruning! I'd only ever seen
the --prune flag to fetch/pull.
On Wed, 23 Oct 2019, 18.30 Oliver Charles, wrote:
> I usually encounter this when there has once been a branch called
> "wip/rae" (so .git would have a *file* wip/rae), but now there's a
>
I suspect a git fetch --prune might help. It looks like git's mapping of
remote branches to a directory tree has caused a conflict between new and
stale branches: ../rae/... can't be a directory if it's already a file!
If that still doesn't work (if it tries to record new branches before
deleting
Thanks. Yes 'git remote prune origin' did the trick!
Simon
| -Original Message-
| From: Oliver Charles
| Sent: 23 October 2019 17:30
| To: Simon Peyton Jones
| Cc: ghc-devs
| Subject: Re: Urgent: git problem
|
| I usually encounter this when there has once been a branch
I do
git pull origin master
And it then works
Alan
On Wed, 23 Oct 2019, 17:29 Simon Peyton Jones via ghc-devs, <
ghc-devs@haskell.org> wrote:
> a completely fresh clone seems ok. but that’s a bit brutal
>
>
>
> *From:* ghc-devs *On Behalf Of *Simon
> Peyton Jones via ghc-devs
> *Sent:* 23
I usually encounter this when there has once been a branch called
"wip/rae" (so .git would have a *file* wip/rae), but now there's a
branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a
directory, but it's already in .git as a file! I think "git remote
prune" fixes this, but I can't
Hi,
Some googling turned up this SO thread
https://stackoverflow.com/a/43253320/388010
Does that help?
Cheers
Sebastian
Am Mi., 23. Okt. 2019 um 17:22 Uhr schrieb Simon Peyton Jones via ghc-devs <
ghc-devs@haskell.org>:
> Aieee! All my GHC repos are failing with this. As a result I can’t
>
a completely fresh clone seems ok. but that's a bit brutal
From: ghc-devs On Behalf Of Simon Peyton Jones
via ghc-devs
Sent: 23 October 2019 17:22
To: ghc-devs
Subject: Urgent: git problem
Aieee! All my GHC repos are failing with this. As a result I can't pull.
What should I do?
Aieee! All my GHC repos are failing with this. As a result I can't pull.
What should I do? Thanks!
Simon
git pull
error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep':
'refs/remotes/origin/wip/rae' exists; cannot create
'refs/remotes/origin/wip/rae/remove-tc-dep'
>From
Duplicate record fields is going to make this a bigger problem. Vim does
support duplicate tags (:tselect and :tjump and related bindings), but
hopefully haskell-ide-engine will one day provide us with semantic tags and
solve this problem once and for all!
On Wed, 23 Oct 2019, 17.49 Matthew
Thanks Omer, Sylvain and Sebastian
.
I just configured my editor to use fzf and now I can use the `:GFiles`
command to perform fuzzy search on files which is probably better than
tags. If anyone else is using NixOS, all I had to do was add the
`fzf-vim` plugin to the vim configuration.
Cheers,
With `--fully-qualified` fast-tags also generates qualified tags:
```
GHC.Hs GHC/Hs.hs 21;" m
GHC.Hs.Binds GHC/Hs/Binds.hs 20;" m
GHC.Hs.Binds.ABE GHC/Hs/Binds.hs 349;" C
...
```
If your code editor can search for qualified tags, I guess it should
work. There is a
I use a file finder (fzf) for jumping to files. Because module names follow file
paths to jump to e.g. StgToCmmUtils.Utils I usually type `stgcmmutils` and
fzf finds the correct file `compiler/GHC/StgToCmm/Utils.hs`.
When generating tags I omit module names for this reason, it's easy with a good
FWIW, I'm using VSCode's fuzzy file search with Ctrl+P (and vim's
equivalent) rather successfully. Just tried it for Hs/Utils.hs by typing
'hsutils.hs'. It didn't turn up as the first result in VSCode, but it in
vim.
Am Mi., 23. Okt. 2019 um 14:27 Uhr schrieb Matthew Pickering <
I use `fast-tags` which doesn't look at the hierarchy at all and I'm
not sure what the improvement would be as the names of the modules
would still clash.
If there is some other recommended way to jump to a module then that
would also work for me.
Matt
On Wed, Oct 23, 2019 at 12:08 PM Sylvain
Hi,
How do you generate your tags file? It seems to be a shortcoming of the
generator to not take into account the location of the definition file.
> Perhaps `HsUtils` and `StgUtils` would be appropriate to
disambiguate`Hs/Utils` and `StgToCmm/Utils`.
We are promoting the module prefixes
Hi,
The module rework has broken my workflow.
Now my tags file is useless for jumping for modules as there are
multiple "Utils" and "Types" modules. Invariable I am jumping to the
wrong one. What do other people do to avoid this?
Can we either revert these changes or give these modules unique
Hi, lately i am being collaborated in the haskell-ide-engine (hie) repo and
one of the issues i get to fix was related with the parsing of ghc errors.
It turns out that delimiters of terms in errors are different in windows
(`term') and *nix (‘term’) systems and that drive to parse errors.
Quite
19 matches
Mail list logo
