Re: Stgit and refresh-temp

From: Karl Hasselström <kha@treskal.com>
Date: Nov 12, 2008, 08:01 UTC
Message-ID: <20081112080103.GA25454@diana.vm.bytemark.co.uk>
In-Reply-To: <b0943d9e0811110959t4eb236bvd648fbca5e482911@mail.gmail.com>

On 2008-11-11 17:59:02 +0000, Catalin Marinas wrote:

Show 17 quoted lines

> 2008/11/7 Karl Hasselström <kha@treskal.com>:
>
> > On 2008-11-04 08:37:24 -0500, Jon Smirl wrote:
> >
> > > I hit a case when refreshing a buried patch that needed a merge
> > > conflict sorted out. I'm unable to recover out of the state.
> >
> > Hmm, so what you're saying is basically that you did something
> > with "stg refresh -p" that caused a merge conflict, and that
> > messed things up so that you needed to run "stg repair". Is that
> > right?
>
> Could be related to this - if I run 'stg goto some-patch' and it
> fails with a conflict, the HEAD points to the previous patch though
> the stack has the conflicting patch as empty (which is normal) and
> the conflicts in the index. Anything after that says HEAD and top
> not equal and 'stg repair' is needed.

Ah, yes, that could definitely be the same problem, since those two things end up calling the same functions to handle the conflict.

I'll build a test case for that as well.

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