tree-conlficts after 1.6-to-1.7 upgrade

philip_at_apache.org writes:

> Author: philip
> Date: Thu Jun 9 10:19:42 2011
> New Revision: 1133771
>
> URL: http://svn.apache.org/viewvc?rev=1133771&view=rev
> Log:
> For issue 3916, move tree conflicts from parent to conflicted node
> on upgrade. This makes the regression tests XPASS but I'm marking
> them WIMP for now because I don't know if the conflicts are correct.

In the 1.6 entries file the parent looked like this:

((conflict X dir update added added (version file:///home/pm/sw/subversion/obj/repo 1 1 A/X none) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/X dir)) (conflict Y dir update added added (version file:///home/pm/sw/subversion/obj/repo 1 1 A/Y none) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/Y dir)))

After upgrade from 1.6 to 1.7 the ACTUAL_NODE rows look like:

1|A/X|A||||||||(conflict X dir update added added (version file:///home/pm/sw/subversion/obj/repo 1 1 A/X none) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/X dir))||||
1|A/Y|A||||||||(conflict Y dir update added added (version file:///home/pm/sw/subversion/obj/repo 1 1 A/Y none) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/Y dir))||||

But if I create the conflicts using 1.7 the ACTUAL_NODE rows look like:

1|A/X|A||||||||(conflict X dir update added added (version 0 2 -1 0 0 ) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/X dir))||||
1|A/Y|A||||||||(conflict Y dir update added added (version 0 2 -1 0 0 ) (version file:///home/pm/sw/subversion/obj/repo 1 3 A/Y dir))||||

I haven't been following the details of tree conflict storage, are
differences like that going to be a problem?

-- 
Philip