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.
- Julian
> OH MY! It's not update_tests.py!
> It's *merge_tests.py -v 19*!
>
> I should go to bed.
> ~Neels
>
> Neels J Hofmeyr wrote:
> > With attached patch, update_tests.py 19 reports a double tree-conflict:
> >
> > [[[
> > CMD: svn merge -r1:2
> > file:///arch/elego/svn/trunk/subversion/tests/cmdline/svn-test-work/repositories/merge_tests-19/A/B/F
> > svn-test-work/working_copies/merge_tests-19/A/C --config-dir
> > /arch/elego/svn/trunk/subversion/tests/cmdline/svn-test-work/local_tmp/config
> > --password rayjandom --no-auth-cache --username jrandom <TIME = 0.031309>
> > --- Merging r2 into 'svn-test-work/working_copies/merge_tests-19/A/C':
> > C svn-test-work/working_copies/merge_tests-19/A/C/Q
> > C svn-test-work/working_copies/merge_tests-19/A/C/Q
> > A svn-test-work/working_copies/merge_tests-19/A/C/foo
> > Summary of conflicts:
> > Tree conflicts: 2
> > ]]]
> >
> > ~Neels
> >
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-26 20:03:57 CET