C. Michael Pilato wrote:
> Lieven Govaerts wrote:
>> Committed in r29220. I found one failure in merge test 62, but it
>> looks like this fix actually shows that the test should have been
>> failing after all.
> That's exactly what I was concerned would happen. Thanks for looking
> into this, Lieven.
So, Paul, merge test 62 is failing because it expects some output from a
no-op merge (just the header line), and gets none. I thought we deferred
printing of the header line until there was actually something really
merged? But if that's true, the test would still fail because a few
commands before the current failure, it does a different no-op merge with
the same header-only expectation, and the merge *does* print just the header.
Anything come to mind quickly regarding what might be going on here?
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2008-02-07 17:43:13 CET