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

Re: svn commit: r1379426 - in /subversion/trunk/subversion: bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java include/svn_wc.h libsvn_wc/conflicts.c libsvn_wc/tree_conflicts.c libsvn_wc/update_editor.c svn/tree-conflicts.c

From: Stefan Sperling <stsp_at_apache.org>
Date: Fri, 31 Aug 2012 15:01:37 +0200

On Fri, Aug 31, 2012 at 12:04:24PM -0000, rhuijben_at_apache.org wrote:
> Author: rhuijben
> Date: Fri Aug 31 12:04:23 2012
> New Revision: 1379426
> URL: http://svn.apache.org/viewvc?rev=1379426&view=rev
> Log:
> Remove the new in 1.8, but now unused tree conflict reason
> 'moved-away-and-edited'.
> The moved-away status is just a cleaner way of reporting that the
> node is deleted and at the same time the root moved. (Which could
> also apply to a replaced node). The combination with edited applies
> only to a slight subset of the cases and should really be reported
> on the to-location of the move.

Thanks for taking care of this, Bert. I had been planning to remove
this conflict reason, too. I introduced it to allow the update editor
to label this particular case in a special way.
But with the new design of handling this at 'svn resolve' time we don't
need this special conflict reason anymore. The resolver can compare file
contents at run time to determine whether the file was also edited
before or after being moved.
Received on 2012-08-31 15:02:13 CEST

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