On 2007-08-22 11:37:03 +0200, David Kågedal wrote: > Karl Hasselström <kha@xxxxxxxxxxx> writes: > > > On 2007-08-20 10:11:59 +0200, David Kågedal wrote: > > > > > This avoid duplicating work, but also changes the resulting > > > index state so that the conflicts are left in the index in the > > > three stages. > > > > After this patch, t1400-patch-history fails: > > I think that the push(c) commits will never happen with my patches, > so the test case needs an update. Actually, the failure vanishes once the next patch in the series is applied. I thought this was a good thing, but if they're never supposed to happen, maybe the test is still broken, just not in a way that's detected? -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle - 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