I think you just blasted away the wrong log... r33803 versus r38803.
On Tue, Aug 18, 2009 at 17:21, Stephen Butler<sbutler_at_elego.de> wrote:
> Author: sbutler
> Revision: 33803
> Property Name: svn:log
> Action: modified
>
> Property diff:
> --- old property value
> +++ new property value
> @@ -1,6 +1,15 @@
> -Document svn_stream_open_unique. (oops!)
> +Correct a test that runs a 2-url merge the wrong way (which
> +didn't do what it's supposed to be testing). This causes a
> +duplicate tree conflict error. Fix that by calling a
> +function that handles the duplicate. That's an improvement,
> +but the tree conflict victim now appears twice in the merge
> +output, so set the test to XFail().
>
> -Found by: hwright
> +* subversion/tests/cmdline/merge_tests.py
> + (merge_replace_causes_tree_conflict): Reverse the merge URL
> + arguments so that the merge actually replaces things.
> + (test_list): Wrap the test in XFail().
>
> -* subversion/include/svn_io.h:
> - (svn_stream_open_unique): document
> +* subversion/libsvn_client/merge.c
> + (merge_dir_added): call the function tree_conflict_on_add()
> + to avoid a duplicate tree conflict.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2384809
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2384812
Received on 2009-08-18 17:34:16 CEST