Re: Tree conflict fix in 1.6.x STATUS

On Tue, Aug 18, 2009 at 08:45:34PM +0100, Julian Foad wrote:
> The reason seems partly to be that the test tries the wrong merge
> command:
> [[[
> svn merge file:///[...]/branch file:///[...]/A [...]/A
> --- Merging differences between repository URLs into 'svn-test-work/working_copies/merge_tests-133/A':
> C svn-test-work/working_copies/merge_tests-133/A/B/E
> C svn-test-work/working_copies/merge_tests-133/A/mu
> C svn-test-work/working_copies/merge_tests-133/A/D/G/pi
> C svn-test-work/working_copies/merge_tests-133/A/D/H
> Summary of conflicts:
> Tree conflicts: 4
> ]]]
>
> which, although its output looks like what we expect, is actually a
> nonsensical two-URL merge.

Stephen Butler noted this problem, too. See r38803.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2384949
Received on 2009-08-18 22:00:13 CEST