On 2007-08-22 11:44:13 +0200, Karl Hasselström wrote:
> On 2007-08-22 11:37:03 +0200, David Kågedal wrote:
>
> > 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?
No, after path 2 we don't get a push(c) entry, and the test fails, but
after patch 3 we get it again and the test succeeds.
Looking at the code (the string "push(c)" occurs exactly once, so it's
easy to find), it seems the log stuff continues to work as expected
after patch 3: it writes a "push(c)" entry when the patch becomes
empty due to conflicts, and its entire contents are dumped in the wd
(or the index+wd with your patches). So it is just patch 2 that needs
fixing -- and I suspect the fix might be to merge it with patch 3.
--
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
