Re: [MIT-Scheme-devel] It stopped working..

[Chris Hanson]

The easiest way to roll back your repository is

git reset --hard <commit>

This will affect only your local repository.  It throws away
everything newer than the given commit.  When you want to get it back,
use git pull.

On Fri, Nov 6, 2009 at 1:37 PM, Joe Marshall <address@hidden> wrote:
> On Fri, Nov 6, 2009 at 1:20 PM, Taylor R Campbell <address@hidden> wrote:
>> I changed the calling conventions on x86-64.    I'll say
>> when I think the calling conventions are stable.
>
> Yes, please do!
>
>>   So now I'm trying to roll back my local tree to three days ago.
>>   (wish me luck.  Git doesn't seem to have a `pretend the last
>>   three days never happened' command.)
>>
>> I tried to figure that out, and the best I could manage was `rm -rf *;
>> git reset --hard <commit-id>'.  The commit id you probably want is
>> d9a39924ae7154c0122c901f5ad5c453938fab44, which precedes the rewriting
>> of the configure scripts.
>
> It took a little while, but I figured it out.  First I did this:
> git-checkout -f 8886c0bfea21d43276f14486567af2dfefd5ad29
>
> This seems to have `detached' my HEAD and set my local working
> directory to the desired state.  However, it also removed a change that
> I have committed, but not yet pushed, and I still wanted that change.
> A little futzing around and I came up with this:
>
> git-checkout -f ORIG_HEAD -- src/runtime/port.scm
>
> So now my local working directory has the state from 3 days ago
> plus the extra change.
>
> It's the desired outcome, but not the desired path to the outcome.
>
>
>
> --
> ~jrm
>
>
> _______________________________________________
> MIT-Scheme-devel mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/mit-scheme-devel
>