Resolve issue #1743: Inconsistent expansion of $Id$ keyword.
Resolve issue #1743: Inconsistent expansion of $Id$ keyword.

* subversion/libsvn_wc/update_editor.c
  (merge_file): Check whether we have keywords. This may require
   retranslation regardless of content or magic props changes.


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

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