[PATCH] tree conflicts and obstructions

Hi,

here's my first shot at tree conflicts and obstructions.

I'm posting this here mainly for review and testing by
Julian and Senthil, but if anyone else wants to take a
peek, go right ahead :)

[[[

On the tree-conflicts branch, flag tree conflicts upon obstructed
files during merge.

* subversion/libsvn_wc/tree_conflicts.c
  (tree_conflict_phrases): New member obstructed, which holds
   a phrase describing an obstructed tree conflict victim.
  (new_tree_conflict_phrases): Initialise new member of tree_conflict_phrases.
  (select_our_phrase, read_reason,
   svn_wc__write_tree_conflicts_to_entry,
   svn_wc_append_tree_conflict_info_xml): Handle new member of
    tree_conflict_phrases.

* subversion/libsvn_wc/tree_conflicts.h
  (SVN_WC__CONFLICT_REASON_OBSTRUCTED): New constant.

* subversion/libsvn_client/merge.c
  (persist_tree_conflict): New function.
  (merge_file_changed): Use persist_tree_conflict instead of inline code.
  (merge_file_added, merge_file_deleted): Use persist_tree_conflict instead
   of inline code. Detect and persist tree conflicts caused by obstructions.

]]]

Thanks,

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner