testsuite change

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

testsuite change

Simon Peyton Jones
Herbert

I did 'git pull'  in my source tree and got the error below.  What do I do now?

Simon


== running git pull
remote: Counting objects: 56029, done.
remote: Compressing objects: 100% (16843/16843), done.
remote: Total 55837 (delta 32572), reused 55743 (delta 32500)
Receiving objects: 100% (55837/55837), 6.47 MiB | 2.96 MiB/s, done.
Resolving deltas: 100% (32572/32572), completed with 102 local objects.
>From git://git.haskell.org/ghc
   b7ddf63..9c91a24  master     -> origin/master
Updating b7ddf63..9c91a24
error: The following untracked working tree files would be overwritten by merge:
            testsuite/.gitignore
            testsuite/LICENSE
            testsuite/LICENSE.GPL
            testsuite/Makefile
            testsuite/README.md
            testsuite/config/bad.ps
            testsuite/config/ghc
            testsuite/config/good.ps
            testsuite/driver/runtests.py
            testsuite/driver/testglobals.py
            testsuite/driver/testlib.py
            testsuite/driver/testutil.py
            testsuite/mk/boilerplate.mk
            testsuite/mk/ghc-config.hs
            testsuite/mk/test.mk
            testsuite/tests/Makefile
            testsuite/tests/annotations/Makefile
            testsuite/tests/annotations/should_compile/Makefile
            testsuite/tests/annotations/should_compile/all.T
            testsuite/tests/annotations/should_compile/ann01.hs
            testsuite/tests/annotations/should_compile/ann01.stderr
            testsuite/tests/annotations/should_fail/Annfail04_Help.hs
            testsuite/tests/annotations/should_fail/Annfail05_Help.hs
            testsuite/tests/annotations/should_fail/Annfail06_Help.hs
            testsuite/tests/annotations/should_fail/Makefile
            testsuite/tests/annotations/should_fail/all.T
            testsuite/tests/annotations/should_fail/annfail01.hs
            testsuite/tests/annotations/should_fail/annfail01.stderr
            testsuite/tests/annotations/should_fail/annfail02.hs
            testsuite/tests/annotations/should_fail/annfail02.stderr
            testsuite/tests/annotations/should_fail/annfail03.hs
            testsuite/tests/annotations/should_fail/annfail03.stderr
            testsuite/tests/annotations/should_fail/annfail04.hs
            testsuite/tests/annotations/should_fail/annfail04.stderr
            testsuite/tests/annotations/should_fail/annfail05.hs
            testsuite/tests/annotations/should_fail/annfail05.stderr
            testsuite/tests/annotations/should_fail/annfail06.hs
            testsuite/tests/annotations/should_fail/annfail06.stderr
            testsuite/tests/annotations/should_fail/annfail07.hs
            testsuite/tests/annotations/should_fail/annfail07.stderr
            testsuite/tests/annotations/should_fail/annfail08.hs
            testsuite/tests/annotations/should_fail/annfail08.stderr
            testsuite/tests/annotations/should_fail/annfail09.hs
            testsuite/tests/annotations/should_fail/annfail09.stderr
            testsuite/tests/annotations/should_fail/annfail10.hs
            testsuite/tests/annotations/should_fail/annfail10.stderr
            testsuite/tests/annotations/should_fail/annfail11.hs
            testsuite/tests/annotations/should_fail/annfail11.stderr
            testsuite/tests/annotations/should_fail/annfail12.hs
            testsuite/tests/annotations/should_fail/annfail12.stderr
            testsuite/tests/annotations/should_fail/annfail13.hs
            testsuite/tests/annotations/should_fail/annfail13.stderr
            testsuite/tests/annotations/should_run/Annrun01_Help.hs
            testsuite/tests/annotations/should_run/Makefile
            testsuite/tests/annotations/should_run/all.T
            testsuite/tests/annotations/should_run/annrun01.hs
            testsuite/tests/annotations/should_run/annrun01.stdout
            testsuite/tests/arityanal/Main.hs
            testsuite/tests/arityanal/Main.stderr
            testsuite/tests/arityanal/Makefile
            testsuite/tests/arityanal/f0.hs
            testsuite/tests/arityanal/f0.stderr
            testsuite/tests/arityanal/f1.hs
            testsuite/tests/arityanal/f1.stderr
            testsuite/tests/arityanal/f10.hs
            testsuite/tests/arityanal/f10.stderr
            testsuite/tests/arityanal/f11.hs
            testsuite/tests/arityanal/f11.stderr
            testsuite/tests/arityanal/f12.hs
            testsuite/tests/arityanal/f12.stderr
            testsuite/tests/arityanal/f13.hs
            testsuite/tests/arityanal/f13.stderr
            testsuite/tests/arityanal/f14.hs
            testsuite/tests/arityanal/f14.stderr
            testsuite/tests/arityanal/f15.hs
            testsuite/tests/arityanal/f15.stderr
            testsuite/tests/arityanal/f2.hs
            testsuite/tests/arityanal/f2.stderr
            testsuite/tests/arityanal/f3.hs
            testsuite/tests/arityanal/f3.stderr
            testsuite/tests/arityanal/f4.hs
            testsuite/tests/arityanal/f4.stderr
            testsuite/tests/arityanal/f5.hs
            testsuite/tests/arityanal/f5.stderr
            testsuite/tests/arityanal/f6.hs
            testsuite/tests/arityanal/f6.stderr
            testsuite/tests/arityanal/f7.hs
            testsuite/tests/arityanal/f7.stderr
            testsuite/tests/arityanal/f8.hs
            testsuite/tests/arityanal/f8.stderr
            testsuite/tests/arityanal/f9.hs
            testsuite/tests/arityanal/f9.stderr
            testsuite/tests/arityanal/prim.hs
            testsuite/tests/arityanal/prim.stderr
            testsuite/tests/array/Makefile
            testsuite/tests/array/shou
Aborting
git failed: 256 at ./sync-all line 120.
== Checking for old haddock repo
== Checking for old binary repo
== Checking for old mtl repo
== Checking for old Cabal repo
== Checking for old time from tarball
== Checking for obsolete Git repo URL
simonpj at cam-05-unx:~/code/HEAD-2$
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20140113/ff796864/attachment-0001.html>

Reply | Threaded
Open this post in threaded view
|

testsuite change

Herbert Valerio Riedel-3
Hello Simon,

On 2014-01-13 at 13:08:02 +0100, Simon Peyton Jones wrote:
> I did 'git pull'  in my source tree and got the error below.  What do
> I do now?

the easist is to just move the testsuite folder out the way;

e.g. mv testsuite/ testsuite-old/


Reply | Threaded
Open this post in threaded view
|

testsuite change

Simon Peyton Jones
and then?  are all those untracked files really untracked?  I definitely didn't add them!  Have they been lost from the tree somehow?


| -----Original Message-----
| From: Herbert Valerio Riedel [mailto:hvriedel at gmail.com]
| Sent: 13 January 2014 12:16
| To: Simon Peyton Jones
| Cc: ghc-devs at haskell.org
| Subject: Re: testsuite change
|
| Hello Simon,
|
| On 2014-01-13 at 13:08:02 +0100, Simon Peyton Jones wrote:
| > I did 'git pull'  in my source tree and got the error below.  What do
| > I do now?
|
| the easist is to just move the testsuite folder out the way;
|
| e.g. mv testsuite/ testsuite-old/


Reply | Threaded
Open this post in threaded view
|

testsuite change

Simon Peyton Jones
..and indeed, having followed your advice, the new tree contains the claimed not-present files.  So all seems well.  But it's a mystery to me.

Simon

| -----Original Message-----
| From: ghc-devs [mailto:ghc-devs-bounces at haskell.org] On Behalf Of Simon
| Peyton Jones
| Sent: 13 January 2014 12:19
| To: Herbert Valerio Riedel
| Cc: ghc-devs at haskell.org
| Subject: RE: testsuite change
|
| and then?  are all those untracked files really untracked?  I definitely
| didn't add them!  Have they been lost from the tree somehow?
|
|
| | -----Original Message-----
| | From: Herbert Valerio Riedel [mailto:hvriedel at gmail.com]
| | Sent: 13 January 2014 12:16
| | To: Simon Peyton Jones
| | Cc: ghc-devs at haskell.org
| | Subject: Re: testsuite change
| |
| | Hello Simon,
| |
| | On 2014-01-13 at 13:08:02 +0100, Simon Peyton Jones wrote:
| | > I did 'git pull'  in my source tree and got the error below.  What
| | > do I do now?
| |
| | the easist is to just move the testsuite folder out the way;
| |
| | e.g. mv testsuite/ testsuite-old/
|
| _______________________________________________
| ghc-devs mailing list
| ghc-devs at haskell.org
| http://www.haskell.org/mailman/listinfo/ghc-devs

Reply | Threaded
Open this post in threaded view
|

testsuite change

Herbert Valerio Riedel-3
In reply to this post by Simon Peyton Jones
On 2014-01-13 at 13:18:53 +0100, Simon Peyton Jones wrote:
> and then?  are all those untracked files really untracked?  I
> definitely didn't add them!  Have they been lost from the tree
> somehow?

Well, Git just detects there's already something which it would
overwrite (as it doesn't know what a nested testsuite/.git means).

So they're were only untracked from ghc.git's perspective. If you want
to make sure you really have no uncommitted things there, just cd into
testsuite/ (or testsuite-old if you moved it already), and run 'git
status'/'git log' and other common Git commands to find out if there's
something worth saving over from the old standalone testsuite.git

(Git commands will use the first found .git/ folder while traversing
upwards towards the filesystem root)

HTH,
  hvr

>
>
> | -----Original Message-----
> | From: Herbert Valerio Riedel [mailto:hvriedel at gmail.com]
> | Sent: 13 January 2014 12:16
> | To: Simon Peyton Jones
> | Cc: ghc-devs at haskell.org
> | Subject: Re: testsuite change
> |
> | Hello Simon,
> |
> | On 2014-01-13 at 13:08:02 +0100, Simon Peyton Jones wrote:
> | > I did 'git pull'  in my source tree and got the error below.  What do
> | > I do now?
> |
> | the easist is to just move the testsuite folder out the way;
> |
> | e.g. mv testsuite/ testsuite-old/
>

--
"Elegance is not optional" -- Richard O'Keefe