Re: [PATCH] XFail test to prove issue #3146

On Tue, Apr 01, 2008 at 07:34:03PM +0530, Senthil Kumaran S wrote:
>> Please feel free to commit this test to the tree-conflicts branch
>> after fixing the expected output and expected status as noted above
>> (i.e. +1 from me).
>
> Committed in r30153 after the modifying the expected status and output.

I just saw one more thing:

The expected output for the 'svn info' command in the test
currently is: "The merge attempted to edit the file 'alpha-moved'"

But the test is moving a file on trunk, and merges that move operation
into the branch. In which case the editor on the client side of the
merge will end up running merge_file_deleted() to carry out the delete
part of the move. This routine is where we flag the tree conflict from.

So I think the expected output for 'svn info' should be:

"The merge attempted to delete the file 'alpha-moved'"

Because this is what 'svn info' happens to print for a tree conflict
detected in merge_file_deleted().

See libsvn_client/merge.c. The routine merge_file_deleted() sets
        conflict->action = svn_wc_conflict_action_delete
for all tree conflicts it finds, and it will also do this in the
obstruction case.

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner