Bert Huijben wrote: >> 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.
>> @@ -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) Accidental change. Reverted. Thanks for catching it. > 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. Will discuss another time in another thread. - Julian
