Re: Rollback of git commands

From: Jon Smirl <jonsmirl@gmail.com>
Date: Nov 28, 2007, 15:13 UTC
Message-ID: <9e4733910711280713n6b439866m55bea4824efd959@mail.gmail.com>
In-Reply-To: <20071128092234.GA12977@diana.vm.bytemark.co.uk>

On 11/28/07, Karl Hasselström <kha@treskal.com> wrote:

Show 16 quoted lines

> 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?

all my patches applied git rebase cursing.... I immediately knew what I had done update stg and install it stg repair four of my 15 patches tried to apply, I received messages that there were all empty most stg commands won't work, they complain that the commit references in the stg .git/* state are not correct.

I then proceed to manually attempt repair.

Show 5 quoted lines

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

-- 
Jon Smirl
jonsmirl@gmail.com