simonpj at microsoft.com
Mon Aug 22 09:53:23 CEST 2011
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
remote: From /r/c--/papers/dfopt[K
remote: 6ffca82..b98db91 master -> tufts-master/master[K
remote: = [up to date] shapeclassifier -> tufts-master/shapeclassifier[K
remote: error: Your local changes to the following files would be overwritten by merge:[K
remote: Please, commit your changes or stash them before you can merge.[K
remote: Updating cf8723c..b98db91[K
remote: darcs failed: No files were added[K
remote: No changes![K
remote: Pushing to "/r/ghc/darcs-mirrors/hoopl"...[K
remote: No recorded local changes to push![K
6ffca82..b98db91 master -> master
More information about the Cvs-ghc