[PATCH] Merge skips obstructions, issue #3161 [was: tree-conflicts: double-tree-conflict bug!]

On Wed, 2008-11-26 at 19:03 +0000, Julian Foad wrote:
> On Wed, 2008-11-26 at 07:06 +0100, Neels J Hofmeyr wrote:
> > BTW, the patch should have nothing to do with the double conflict, it only
> > makes the test pass up to that point (the patch only changes behaviour with
> > an unversioned file, while that merge is about a directory).
>
> I committed this patch in r34437.
>
> The double-conflict has yet to be investigated.

OK... The double-conflict is just one symptom of not distinguishing
clearly between obstructions and tree conflicts.

I have started a patch, attached, to skip obstructions and not allow
them to be detected as tree conflicts. This task is issue #3161. My
approach is to use a single function that checks the expected node kind
and the actual node kind on disk, and raises a flag if they differ.

I have made merge_tests 19 pass with this patch. It makes some other
tests fail, and I haven't yet investigated them.

Review/comments/further work most welcome.

- Julian
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org