Now `git pull' is failing very badly in my work repository: % git pull remote: Counting objects: 2966, done. remote: Compressing objects: 100% (108/108), done. remote: Total 1580 (delta 1476), reused 1568 (delta 1468) Receiving objects: 100% (1580/1580), 404.93 KiB | 647 KiB/s, done. Resolving deltas: 100% (1476/1476), completed with 1321 local objects. >From ssh://git.sv.gnu.org/srv/git/mit-scheme + 8acc2b0...a996c47 HEAD -> origin/HEAD (forced update) error: Ref refs/remotes/origin/master is at a996c47f0b70804af9c42cc25b63a14460f56283 but expected 8acc2b030731d65913522fd3d63e18aacd1f20d0 ! 8acc2b0..a617168 master -> origin/master (unable to update local ref)
If I repeat `git pull', it gives a different error: % git pull >From ssh://git.sv.gnu.org/srv/git/mit-scheme a996c47..a617168 master -> origin/master Updating 944e600..a617168 error: Entry 'src/microcode/object.h' not uptodate. Cannot merge. Earlier, I tried deleting these files that it gave errors about (and each `git pull' gave an error about a different one once I deleted the last -- it helpfully did not list all of the problematic files), thinking that `git pull' might behave like `cvs update' and revert the files to their current state. That didn't work, so now my repository is unhappy and I'm missing those files. I guessed that `git revert' might revert those files for me, but apparently it doesn't. The man page for `git reset' seemed to indicate that it would do what I want, namely `Sets the current head to the specified commit and optionally resets the working tree to match.', but: % git reset src/microcode/bkpt.h fatal: ambiguous argument 'src/microcode/bkpt.h': unknown revision or path not in the working tree. Use '--' to separate paths from revisions % git reset -- src/microcode/bkpt.h src/microcode/bkpt.h: locally modified src/microcode/confshared.h: locally modified src/microcode/critsec.h: locally modified src/microcode/fasload.c: locally modified src/microcode/intrpt.h: locally modified src/microcode/memmag.h: locally modified src/microcode/object.h: locally modified src/microcode/osio.h: locally modified src/microcode/outf.h: locally modified src/microcode/returns.h: locally modified src/microcode/scode.h: locally modified src/microcode/syscall.h: locally modified src/runtime/mit-syntax.scm: locally modified src/runtime/sysmac.scm: locally modified Of these files, only mit-syntax.scm and sysmac.scm have changes that I care about. The others either don't exist (the first four) or have $Id$ differences. And after running `git reset', src/microcode/bkpt.h didn't do a better job of existing than before. I probably ought not to have deleted some of the files, but surely it is not an uncommon task to want to revert a few particular files in the working directory -- how can I do this? Or does the first error that `git pull' threw at me indicate that my repository is irreparably screwed? _______________________________________________ MIT-Scheme-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/mit-scheme-devel
