For an incoming-edit vs. local-delete tree conflict, where the locally
deleted subtree has moved-away children, make 'svn resolve --accept working'
break moves without updating any moved-away nodes, and make 'svn resolve
--accept mine-conflict' flag incoming edit vs. local-move conflicts on
moved-away children. The moved-away children can then be updated by resolving
them with 'mine-conflict' as well.

Previously, '--accept working' behaved like '--accept mine-conflict' does now.

Users can now accept the current working copy state (where moved-away nodes
are at a different revision than the move source) with --accept working.
This will break moves and remove conflict markers, but otherwise leave the
working copy unchanged. And most importantly it will not raise new conflicts
in the working copy. Raising new conflicts while resolving to the 'current
working copy state' is at odds with how this operation used to behave in
Subversion 1.7 and older.

Discussed with: philip
http://colabti.org/irclogger/irclogger_log/svn-dev?date=2013-02-25#l48

* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Break moves for moved-away children
   in deleted subtrees when resolution choice is 'merged'. If the choice
   is 'mine_conflict' then raise edit vs. moved-away conflicts on moved-away
   children within the deleted subtree.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_resolve_break_moved_away_children): Declare.

* subversion/libsvn_wc/wc_db_update_move.c
  (break_move): New helper function, split out of ...
  (svn_wc__db_resolve_break_moved_away_internal): ... this function, which
   is otherwise unchanged.
  (break_moved_away_children_internal): New function. Uses the break_move()
   helper to break moves on moved-away children of a given node.
  (svn_wc__db_resolve_break_moved_away_children): New. A wrapper around
   break_moved_away_children_internal() to make it transaction-safe.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_in_delete, layered_moved_to): Use 'mine_conflict' where the previous
   'resolution-to-working' behaviour is expected.


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