---------------------------------------------------------------------------- r31185 | hwright | 2008-05-14 23:59:12 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_client/merge.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.c M /branches/1.5.x/subversion/libsvn_client/mergeinfo.h M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge r30949, r30962 from trunk: * r30949, r30962 Fix issue #3188. Mergeinfo on switched targets/subtrees should elide to repos. Votes: +1: pburba, markphip, cmpilato ---------------------------------------------------------------------------- r31218 | cmpilato | 2008-05-15 15:58:42 EDT Changed paths: M /branches/1.5.x/subversion/libsvn_wc/merge.c M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py Merge from trunk this change group: * (r31159, r31179) or r31193 from 1.5.x-r31159-r31179 branch. Fix "file not found" error when a merge target is a broken symbolic link. Notes: r31179 just makes sure the new test is skipped on Windows. r31193 from 1.5.x-r31159-r31179 branch has r31159 and r31179 merged to it with a conflict resolution. Votes: +1: kfogel(r31159, r31179), kameshj, cmpilato (r31159, r31179)