Stephen Butler wrote:
> Hi folks,
>
> Attached is a patch for testing 'svn update', intended to help clarify the
> discussion of tree conflicts. Note that the current trunk exhibits the
> same behavior as 1.4.5.
>
> If there is interest, I have corresponding test cases for merge and for
> commit (in the presence of tree conflicts). But these two simple
> update tests are probably enough for now.
>
> Regards,
> Steve
Just following up: did this ever get applied, either to the
tree-conflicts branch or trunk?
(Original patch here: http://svn.haxx.se/dev/archive-2007-11/0293.shtml)
-Hyrum
> [[[
> New test cases for current and proposed tree-conflict behavior.
> See notes/tree-conflicts/use-cases.txt, use cases 1-3.
>
> * subversion/tests/cmdline/update_tests.py
> (tree_conflicts_in_updated_files_current): new, for 1.4 and 1.5 behavior
> (tree_conflicts_in_updated_files): new, for proposed behavior (XFail)
> ]]]
Received on Tue Dec 11 17:34:06 2007