Re: svn commit: propchange - r38803 - svn:log

Stephen Butler wrote:
> * subversion/tests/cmdline/merge_tests.py
> (merge_replace_causes_tree_conflict): Reverse the merge URL
> - arguments so that the merge actually replaces things.
> + arguments so that the merge actually replaces things.
> (test_list): Wrap the test in XFail().
>
> -* subversion/libsvn_client/merge.c
> +* subversion/libsvn_client/merge.c
> (merge_dir_added): call the function tree_conflict_on_add()
> - to avoid a duplicate tree conflict.
> + to avoid a duplicate tree conflict.

Oh... OK. I changed the indentation to 2 spaces, and removed the
trailing space, on purpose. But you should have your log message the way
you like it :-)

- Julian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2385125
Received on 2009-08-19 09:48:05 CEST