bc99fe32a8f4acd6a6ae91199a2a57b5a29536c5 - subversion

commit: bc99fe32a8f4acd6a6ae91199a2a57b5a29536c5
[log] [tgz]
author: Evgeny Kotkov <kotkov@apache.org>
Wed Apr 25 14:19:57 2018 +0000
committer: Evgeny Kotkov <kotkov@apache.org>
Wed Apr 25 14:19:57 2018 +0000
tree: 3fab112c2d4d05a66d1f585b8ee13d9b99a0aa4b
parent: ea9bac4fa6356cbfe86424485a22f7d9a053c250 [diff]

Add failing test for issue #4739, "Accept incoming deletion" option doing
nothing for a locally deleted file in the tree conflict resolver.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_update_incoming_delete_locally_deleted_file): New.
  (test_funcs): Run new test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1830083 13f79535-47bb-0310-9956-ffa450edef68

subversion/tests/libsvn_client/conflicts-test.c[diff]

1 file changed

tree: 3fab112c2d4d05a66d1f585b8ee13d9b99a0aa4b