David O'Shea <david.oshea@s3group.com>

Patch

r871233

r871233 | kfogel | 2008-05-13 19:53:12 +0000 (Tue, 13 May 2008)

Fix "file not found" error when a merge target is a broken symbolic link.

Patch by: David O'Shea <david.oshea@s3group.com>

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): Diff against detranslated file if the
    target is "special".

* subversion/tests/cmdlink/merge_tests.py
  (merge_broken_link): New test function.
  (test_list): Call the new test function.