Fix issue #3354, update fails when file with local mods is                  moved and modified
Fix issue #3354, update fails when file with local mods is
                 moved and modified

Note: This commit just fixes the problem, but does not
touch the regression test for this issue (update_test 52).
The test still needs work.

* subversion/libsvn_wc/merge.c
  (maybe_resolve_conflicts): Add copyfrom_text argument.
  (eval_conflict_func_result): As above, and also copy
   the copyfrom text into the working copy in case the user
   postpones conflict resolution.
  (merge_text_file): Track argument changes.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion