> -----Original Message-----
> From: julianfoad_at_apache.org [mailto:julianfoad_at_apache.org]
> Sent: woensdag 13 maart 2013 21:16
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1456117 -
> /subversion/trunk/subversion/include/svn_wc.h
>
> Author: julianfoad
> Date: Wed Mar 13 20:15:53 2013
> New Revision: 1456117
>
> URL: http://svn.apache.org/r1456117
> Log:
> * subversion/include/svn_wc.h
> (svn_wc_merge5, svn_wc_merge_props3): Document the merging of
> properties
> a bit better.
>
> Modified:
> subversion/trunk/subversion/include/svn_wc.h
>
> Modified: subversion/trunk/subversion/include/svn_wc.h
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc
> .h?rev=1456117&r1=1456116&r2=1456117&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/include/svn_wc.h (original)
> +++ subversion/trunk/subversion/include/svn_wc.h Wed Mar 13 20:15:53
> 2013
> @@ -1604,6 +1604,8 @@ typedef enum svn_wc_conflict_reason_t
> svn_wc_conflict_reason_replaced,
> /** Object is moved away. @since New in 1.8. */
> svn_wc_conflict_reason_moved_away,
> + /** Object is moved away & replaced. @since New in 1.8. */
> + svn_wc_conflict_reason_moved_away_replaced,
> /** Object is moved here. @since New in 1.8. */
> svn_wc_conflict_reason_moved_here
This addition is not referenced in your commit message.
(And it appears the value is unused)
I'm not sure how relevant it is on a tree conflict that the node was moved away, if it is replaced. You can get those details from the working copy if you really have to. We don't have to record everything in the reason.
Bert
Received on 2013-03-13 21:19:38 CET