Checkout
Mark Phippard
committed
on 21 Oct 09
Fix failing JavaHL test by using the conflict resolution option of
theirs-conflict instead of theirs-full. The purpose of the test is
just … Show more
Fix failing JavaHL test by using the conflict resolution option of

theirs-conflict instead of theirs-full.  The purpose of the test is

just to test the callback mechanism.  JavaHL expects the SVN API

to work properly, which it currently does not.  There should be a

failing test added to the main test suite to cover the failure so

that it gets the right developer attention.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/BasicTests.java

 (testMergeConflictResolution): Use chooseTheirsConflict instead

  of the no longer working chooseTheirsFull option.

Show less