[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] tree conflicts and obstructions

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 2 Apr 2008 13:15:43 +0200


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_append_tree_conflict_info_xml): Handle new member of

* subversion/libsvn_wc/tree_conflicts.h

* 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.



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

  • application/pgp-signature attachment: stored
Received on 2008-04-02 13:15:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.