Re: svn commit: r34326 - in branches/tc_url_rev/subversion: include include/private libsvn_client libsvn_wc svn
> Author: stsp
> Date: Fri Nov 21 15:45:55 2008
> New Revision: 34326
> On the tc_url_rev branch:
> Resolve conflicts from merge with trunk.
> This commit is rather large for a 'resolve' commit, but catching
> up with progress made on trunk made quite a few changes neccessary.
> * subversion/svn/cl.h
> (svn_cl__node_description): Declare.
> * subversion/svn/util.c
> (svn_cl__node_description): Moved here from ....
> * subversion/svn/tree-conflicts.c
> (node_description): ... here and unstaticed, so we can
> call it from another file. No functional changes.
> Resolve conflicts with trunk. This function cannot add the
> URL_at_rev information directly to the description anymore,
> because the description is now also used in 'svn status'.
> * subversion/svn/info-cmd.c
> (print_info): Print URL_at_rev information here.
> * subversion/include/svn_wc.h
> (svn_wc_conflict_version_t): Sync typedef with actual
> struct name (this was probably a typo). Add comment
> reminding people to update svn_wc__conflict_version_dup()
> when adding members to this struct.
> Make older_version and their_version membes pointers,
> for more straightforward handling in svn_wc__conflict_description_dup().
> (svn_wc_conflict_description_create_tree): Adjust docstring for new
> parameters (see below).
> * subversion/include/private/svn_wc_private.h
> (svn_wc__conflict_version_dup): Declare.
> * subversion/libsvn_wc/util.c
> (svn_wc_conflict_description_create_tree): Add older_version and
> their_version parameters, allowing callers to initialise these
> members when calling this function.
> (svn_wc__conflict_description_dup): Make a deep copy of older_version
> and their_version members.
> (svn_wc__conflict_version_dup): New function to make a deep copy of
> an svn_wc_conflict_version_t object.
> * subversion/libsvn_wc/update_editor.c
> (check_tree_conflict): Track above changes.
> * subversion/libsvn_wc/tree_conflicts.c
> (read_one_tree_conflict): Track above changes.
> * subversion/libsvn_client/merge.c
> (tree_conflict): Track above changes.
Received on 2008-11-22 03:01:57 CET
This is an archived mail posted to the Subversion Dev