* subversion/libsvn_wc/update_editor.c   (close_file): Following up on r1099236, only keep the recorded information     if the merge outcome is unchanged. Without this fix the recorded     information was not cleared when the file got into a text conflict.     (And if you happen to use SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE      _SLEEP_FOR_TIMESTAMPS, that might hide some modifications)
* subversion/libsvn_wc/update_editor.c
  (close_file): Following up on r1099236, only keep the recorded information
    if the merge outcome is unchanged. Without this fix the recorded
    information was not cleared when the file got into a text conflict.
    (And if you happen to use SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE
     _SLEEP_FOR_TIMESTAMPS, that might hide some modifications)


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

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