From: Karl Hasselström <kha@treskal.com>
Date: Wed, 28 Nov 2007 09:22:34 GMT
Subject: Re: Rollback of git commands
Message-ID: <20071128092234.GA12977@diana.vm.bytemark.co.uk>
In-Reply-To: <9e4733910711271733r6f280618pbb14095aebba3309@mail.gmail.com>

On 2007-11-27 20:33:27 -0500, Jon Smirl wrote:

> Let's take my recent problem as an example. I typed 'git rebase
> linus/master' instead of 'stg rebase linus/master'. Then I typed
> 'stg repair'. The repair failed and left me in a mess. Both of these
> are easy to rollback except for the fact that stg has stored a bunch
> of state in .git/*.
>
> After doing the commands I located my last commit before the rebase
> and edited master back to it. But my system was still messed up
> since moving master got me out of sync with the state stg stored in
> .git/*. The 'stg repair' command had changed the stored state.

How exactly did repair mess up? Did it crash, produce a broken result,
an unreasonable but technically valid result, or just not the result
you wanted?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle