* subversion/svn/conflict-callbacks.c   (build_tree_conflict_options): Assign dynamic option codes to unknown    conflict options. This allows the 'svn' client to work against a newer    client library which offers additional conflict options, without having    to modify 'svn' client code.    In practice, we will likely update the 'svn' client with new option codes    at the same time as libsvn_client. But this is not a requirement of the    API and doing dynamic assignment in 'svn' sets a good example which I    hope third party clients will follow.
* subversion/svn/conflict-callbacks.c
  (build_tree_conflict_options): Assign dynamic option codes to unknown
   conflict options. This allows the 'svn' client to work against a newer
   client library which offers additional conflict options, without having
   to modify 'svn' client code.
   In practice, we will likely update the 'svn' client with new option codes
   at the same time as libsvn_client. But this is not a requirement of the
   API and doing dynamic assignment in 'svn' sets a good example which I
   hope third party clients will follow.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion