RE: svn commit: r1449428 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py

> -----Original Message-----
> From: julianfoad_at_apache.org [mailto:julianfoad_at_apache.org]
> Sent: zondag 24 februari 2013 01:08
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1449428 -
> /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
>
> Author: julianfoad
> Date: Sun Feb 24 00:08:22 2013
> New Revision: 1449428
>
> URL: http://svn.apache.org/r1449428
> Log:
> In the tree conflict tests, enable testing with an incoming file
> replacement. For 'switch', don't test with incoming replacements because
> 'switch' ignores ancestry in its repos diff (unlike 'update') and so does
> not notice replacements.

The behavior you describe here for switch has been changed since r1449413, at least as long as you don't pass --ignore-ancestry. (I know that a lot of tree conflict tests do pass this flag though)

I would recommend not calling this a 'repos diff', but something like 'libsvn_repos difference calculation'.
The switch code doesn't use the code that we usually call 'diff', as that is more related to the diff/merge model.

        Bert
Received on 2013-02-24 14:26:02 CET