Re: Stgit and refresh-temp

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Nov 11, 2008, 17:59 UTC
Message-ID: <b0943d9e0811110959t4eb236bvd648fbca5e482911@mail.gmail.com>
In-Reply-To: <20081107054419.GA27146@diana.vm.bytemark.co.uk>

2008/11/7 Karl Hasselström <kha@treskal.com>:

Show 11 quoted lines

> 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?
>
> Have you been able to reproduce it? (I would like to add the failing
> case to the test suite.)

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.

-- 
Catalin