
Begin adding keyword logic to existing EOL logic for checkouts/updates.


* get_editor.c (struct file_baton): add two new fields to file_baton
  for detecting any keyword propchange during the update.

  (change_file_prop): cache any keyword propchange received during update.

  (close_file): carefully decide which value of 'svn:keywords' to use
  during textual merge, by pre-emptively looking for property
  conflicts, and possibly writing out a newly-received value a bit
  early.



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

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