Avoid asserts with properties during move-update.

* subversion/libsvn_wc/wc_db_update_move.c
  (create_conflict_markers): Pass result pool.
  (update_working_file): Initialise work_items, pass separate work_item
   to svn_wc__internal_merge, don't create markers twice, 
  (tc_editor_alter_file): Update the working file when passed non-null
   properties, rename variable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433433 13f79535-47bb-0310-9956-ffa450edef68
In the libsvn_client diff code, replace a baton variable with an argument.

* subversion/libsvn_client/diff.c
  (diff_cmd_baton): Remove force_empty.
  (diff_content_changed): Add argument and use it instead of baton variable.
     Check booleans before calling function.
  (diff_file_changed): Update caller, assuming value false.
  (diff_file_added): Ask forced diff instead of tweaking baton member around
     calls.
  (diff_file_deleted): Update caller.
  (svn_client_diff6,
   svn_client_diff_peg6): Update baton initialization.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433434 13f79535-47bb-0310-9956-ffa450edef68
Sprinkle some svn_error_trace() wrappings.

* subversion/libsvn_repos/reporter.c
  (change_dir_prop,
   change_file_prop,
   check_auth,
   add_file_smartly,
   update_entry,
   drive,
   finish_report,
   write_path_info,
   svn_repos_set_path3,
   svn_repos_link_path3,
   svn_repos_delete_path): Add svn_error_trace() wraps.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433442 13f79535-47bb-0310-9956-ffa450edef68
Tweak some tree conflicts during merge to properly report nodes missing when
they are not deleted and/or moved away.

* subversion/libsvn_client/merge.c
  (check_moved_away): Remove error processing. All callers know if the node
    is in the db as deleted, so shouldn't perform unneeded wc.db calls.
  (merge_file_changed): Only perform moved away check for deleted.
  (merge_file_deleted): Handle missing, and only perform move check for
    deleted.
  (merge_dir_deleted): Provide missing, and only perform move check for
    deleted.
  (merge_dir_opened): Provide missing, and only perform move check for
    deleted.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433455 13f79535-47bb-0310-9956-ffa450edef68
 * subversion/tests/cmdline/update_tests.py
   (update_moved_dir_leaf_del): Update this test to expect the current
    behaviour of the trunk code. Instead of expecting an update to
    automatically update a locally moved subtree, expect a tree conflict
    to be flagged first, and expect 'svn resolve --accept=mine-conflict' to
    automatically apply the update to the locally moved subtree.
    Remove XFail marker, since this test is now passing.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433468 13f79535-47bb-0310-9956-ffa450edef68
Use a boolean to determine when a conflict is resolved, instead of a few
values in an enum, which are eventually just compared to a single value.

* subversion/libsvn_wc/conflicts.c
  (eval_text_conflict_func_result): Simplify output argument.
  (resolve_text_conflicts): Don't call eval_text_conflict_func_result for
    postponing and return result as boolean.
  (svn_wc__conflict_invoke_resolver): Simplify code by not checking a faked
    merge result.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433486 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_edited_leaf_del): Associate this test with issues 3144
   and 3630. Update test expectations to current trunk code, similar to what
   was was done in r1433468. This test test is still failing because we should
   expect a tree conflict when an update is trying to delete an edited file.
   However, the update deletes the edited file from the locally moved subtree.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433488 13f79535-47bb-0310-9956-ffa450edef68