2008/11/12 Karl Hasselström <kha@xxxxxxxxxxx>: > On 2008-11-11 17:59:02 +0000, Catalin Marinas wrote: >> 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 think it's just a matter of updating HEAD on the "merge_conflict" path but I'm still not fully confident in modifying the new lib infrastructure. > I'll build a test case for that as well. We test the conflicts quite a lot in the "push" tests but this command hasn't been converted to the new infrastructure yet. -- Catalin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
