Begin adding keyword logic to existing EOL logic for checkouts/updates.
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.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion