Hoopl

[Simon Peyton-Jones]

Norman (and Ian)

I have just pushed a 1-line change to the master hoopl repo linux.cs.tufts.edu:/r/c--/papers/dfopt.

But I got the error message below.  I have no idea what it is saying, but I suspect the problem is somewhere in the script that pushes the changes to the (now defunct) darcs mirror.  Is that right?  Should I worry about the errors reported below?

It's not clear that we need a darcs mirror for Hoopl any more.  Shall we simply nuke it?

Ian, just to check, you aren't using anything Darcs-ish for Hoopl, are you?  http://hackage.haskell.org/trac/ghc/wiki/Repositories suggests not

Simon


git push
remote: From /r/c--/papers/dfopt
remote:    6ffca82..b98db91  master     -> tufts-master/master
remote:  = [up to date]      shapeclassifier -> tufts-master/shapeclassifier
remote: error: Your local changes to the following files would be overwritten by merge:
remote: 	src/Compiler/Hoopl/Dataflow.hs
remote: 	src/Compiler/Hoopl/Graph.hs
remote: 	src/Compiler/Hoopl/XUtil.hs
remote: Please, commit your changes or stash them before you can merge.
remote: Updating cf8723c..b98db91
remote: Aborting
remote: 
remote: darcs failed:  No files were added
remote: No changes!
remote: Pushing to "/r/ghc/darcs-mirrors/hoopl"...
remote: No recorded local changes to push!
To linux.cs.tufts.edu:/r/c--/papers/dfopt
   6ffca82..b98db91  master -> master
bash-3.1$