If you did not commit your changes and you wish to remove them
git reset --hard
If you want to save/restore them on top of the new version,
git stash git pull git stash pop
It could be that the missing tests are all in those execution errors; if one of the forms in a test gets an execution error, I think none are counted in the passes. So that may be where most of the 4000 tests went.
Liam
On Mon, Aug 9, 2010 at 1:12 PM, Sam Steingold sds@gnu.org wrote:
Hi Liam,
On 8/7/10, Liam Healy lhealy@common-lisp.net wrote:
Are you using an old GSLL? There should be ~4000 tests now.
it should be relatively recent. I can no longer update because I have modified files and I don't know what to do next. $ git pull Updating 7591d6d..7aa0111 calculus/monte-carlo.lisp: needs update histogram/ntuple-example.dat: needs update error: Entry 'calculus/monte-carlo.lisp' not uptodate. Cannot merge.
what is the git analogue of "cvs up -C" or "hg revert"? i.e., how do I remove all my local changes?
-- Sam Steingold http://sds.podval.org