Re: Recover from a bad push in StGit

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Aug 21, 2006, 15:55 UTC
Message-ID: <b0943d9e0608210855m71c29a21y3d4941ec721e0737@mail.gmail.com>
In-Reply-To: <200608211703.59873.robin.rosenberg.lists@dewire.com>

On 21/08/06, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:

Show 5 quoted lines

> måndag 21 augusti 2006 11:35 skrev Catalin Marinas:
> > "stg push --undo" (the same option for "refresh"; maybe I should add a
> > separate "undo" command) resets the local changes and it restores the
> Not necessarily, but a hint about --undo when push/pop fail would have
> helped me.

It is in the "stg help push" output but I could just display it when the conflict happened.

Show 6 quoted lines

> > original boundaries of the patch (no information is lost). You could
> > use the latest snapshot as it has some bug-fixes from release 0.10.
>
> Does refresh --undo make me see the state of the patch like it was before last
> refresh, ie. stgit remembers the history of my patces? I thought it dropped
> the references as obsolete.

The references before the last command are stored and they can be obtained by "stg id <patch>//(bottom|top).old". As long as you haven't run a git prune on your repository, you should be able to undo the refresh.

I'm (slowly) working on patch history support using reflogs and (when ready) you should be able to retrieve a previous state of the patch as long as you haven't pruned your GIT repository.

-- 
Catalin