You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/08/18 15:33:58 UTC
Re: svn commit: propchange - r33803 - svn:log
I think you just blasted away the wrong log... r33803 versus r38803.
On Tue, Aug 18, 2009 at 17:21, Stephen Butler<sb...@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
Re: svn commit: propchange - r33803 - svn:log
Posted by Stephen Butler <sb...@elego.de>.
Quoting Greg Stein <gs...@gmail.com>:
> I think you just blasted away the wrong log... r33803 versus r38803.
Oops, sorry about that. (Thanks Julian, for restoring the old 33803
log already.)
Steve
>
> On Tue, Aug 18, 2009 at 17:21, Stephen Butler<sb...@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
>
--
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2385001