On Mon, Nov 10, 2008 at 6:08 PM, Jon Smirl <jonsmirl@xxxxxxxxx> wrote: > On Fri, Nov 7, 2008 at 12:44 AM, Karl Hasselström <kha@xxxxxxxxxxx> wrote: >> 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? > > Missed the reply. > > Yes, that is what happed. > > I think the problem was this: > > File - xxxxxxx > Patch A adds a line > File - xxxxxxxa > Patch B in the middle adds a line > File - xxxxxxxab > I edit it and add a line > File - xxxxxxxabc > Line c needs to be patch A > stg refresh -p A > ..messed up tree > > > >> >> Have you been able to reproduce it? (I would like to add the failing >> case to the test suite.) Yes, it happens every time the 'stg refresh -p' triggers a merge conflict. stg repair seem to fix it and then I touch things up manually. >> >> -- >> Karl Hasselström, kha@xxxxxxxxxxx >> www.treskal.com/kalle >> > > > > -- > Jon Smirl > jonsmirl@xxxxxxxxx > -- Jon Smirl jonsmirl@xxxxxxxxx -- 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
