* subversion/tests/cmdline/merge_tests.py
  (basic_reintegrate): Insert an update, so this test passes again,
    but include a comment questioning the sanity of the situation.

[Followup: later testing showed that I was indeed insane, and that the
update needed to come earlier, as Paul and I always thought it should.
I have no idea why the test was passing unexpectedly (as described in
the comment mentioned above), but am attributing it to cosmic rays
(read "pilot error"), and have moved the update in r28964.]


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/reintegrate@869023 13f79535-47bb-0310-9956-ffa450edef68
1 file changed