For checkout/update --force, when encountering an obstruction, i.e. a file that exists on disk but is not scheduled for addition, don't set the entry's text-time at all if the obstructing file is modified compared to the text-base being installed.  It makes no sense to set this field unless it reflects the file's timestamp on-disk.
For checkout/update --force, when encountering an obstruction, i.e. a
file that exists on disk but is not scheduled for addition, don't set
the entry's text-time at all if the obstructing file is modified compared
to the text-base being installed.  It makes no sense to set this field
unless it reflects the file's timestamp on-disk.

* subversion/libsvn_wc/update_editor.c
  (change_file_prop): Don't store the last changed date only because
  the file is an obstruction.
  (merge_file): Don't set the entry's text-time for an obstruction, but instead
  leave it blank.


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

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