In the interactive conflict resolver, split logic for handling text conflicts from logic for handling property conflicts. This causes some code duplication, however it allows us to fine-tune conflict prompt menus for each case more easily. Furthermore, I expect the menus to divert further once support for interactively resolving individual property conflicts is added.
In the interactive conflict resolver, split logic for handling text conflicts
from logic for handling property conflicts. This causes some code duplication,
however it allows us to fine-tune conflict prompt menus for each case more
easily. Furthermore, I expect the menus to divert further once support
for interactively resolving individual property conflicts is added.

The prompt for property conflicts is totally messed up right now.
In my testing it shows up like this:

 They want to change the property value to 'Trying to add new property 'foo'
 but the property already exists.
 <<<<<<< (local property value)
 bzzt=======
 bar>>>>>>> (incoming property value)
 ', you want to delete the property.

Seriously? Seems to be a regression on trunk that's so far gone undetected :(

Many options offered during property resolution simply printed a 'this option
is invalid' error. Users will rightly wonder why invalid options are being
offered in the first place, so remove them.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Factor out code for text/prop conflicts into ...
  (handle_text_conflict, handle_prop_conflict): ... these new helpers.
   Rename subpool to scratch_pool. Remove options from the menu in
   handle_prop_conflict() that currently don't apply to property conflicts.


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

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