Fix issue 1173.  It's kind of a lame work around, but it does get us back  to the output we had before the client context was added.
Fix issue 1173.  It's kind of a lame work around, but it does get us back 
to the output we had before the client context was added.

* subversion/libsvn_client/diff.c
  (merge_file_added, merge_dir_added): temporarily NULL out the client 
   context's notification callback before calling svn_client_copy, and 
   restore it afterwards.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@845346 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion