Re: Recover from a bad push in StGit

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Aug 21, 2006, 15:03 UTC
Message-ID: <200608211703.59873.robin.rosenberg.lists@dewire.com>
In-Reply-To: <tnxk652torl.fsf@arm.com>

måndag 21 augusti 2006 11:35 skrev Catalin Marinas:

Show 14 quoted lines

> Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:
> > I recently did some reordering of patches and goofed up (not totally, but
> > anyway). I pushed a number of patches and forgot one in the middle
> > resulting in a merge  conflict. Pop won't work since I have local changes
> > from the conflict and I don't want to resolve the conflict either since I
> > didn't mean to push the patch at that point.
> >
> > Is there a simple way of undoing a bad push?
> >
> > In this case I had a fresh export do help me out so I could just delete
> > the patches and re-import them again, but what if I didn't?
>
> "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.

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

-- robin