Re: svn commit: r24762 - in branches/1.4.x-r24755: . subversion/libsvn_client subversion/tests/cmdline

I'm getting a failure from merge test #1 over ra_local with this
backport:

$ ./merge_tests.py 1
Got singleton from expected tree: pi
 * Node name: pi
    Path: svn-test-work/working_copies/merge_tests-1.other/A/D/G/pi
    Contents: None
    Properties: {}
    Attributes: {'status': 'G '}
    Children: is a file.
Unequal at node G
Unequal at node D
Unequal at node A
Unequal at node merge_tests-1.other
Unequal at node working_copies
Unequal at node svn-test-work
EXCEPTION: SVNTreeUnequal
FAIL: merge_tests.py 1: performing a merge, with mixed results

Isn't the point of this change to suppress this exact behavior?

On Tue, 24 Apr 2007, dlr@tigris.org wrote:

> Author: dlr
> Date: Tue Apr 24 13:03:51 2007
> New Revision: 24762
>
> Log:
> Create backport branch for r24755.
>
> Added:
> branches/1.4.x-r24755/ (props changed)
> - copied from r24761, /branches/1.4.x/
> Modified:
> branches/1.4.x-r24755/subversion/libsvn_client/diff.c
> branches/1.4.x-r24755/subversion/tests/cmdline/merge_tests.py
>
> Modified: branches/1.4.x-r24755/subversion/libsvn_client/diff.c
> URL: http://svn.collab.net/viewvc/svn/branches/1.4.x-r24755/subversion/libsvn_client/diff.c?pathrev=24762&r1=24761&r2=24762
> ==============================================================================
> --- /branches/1.4.x/subversion/libsvn_client/diff.c (original)
> +++ branches/1.4.x-r24755/subversion/libsvn_client/diff.c Tue Apr 24 13:03:51 2007
> @@ -895,18 +895,12 @@
> merge_b->merge_options, subpool));
> }
>
> - /* Philip asks "Why?" Why does the notification depend on whether the
> - file had modifications before the merge? If the merge didn't change
> - the file because the local mods already included the change why does
> - that result it "merged" notification? That's information available
> - through the status command, while the fact that the merge didn't
> - change the file is lost :-( */
> -
> if (content_state)
> {
> if (merge_outcome == svn_wc_merge_conflict)
> *content_state = svn_wc_notify_state_conflicted;
> - else if (has_local_mods)
> + else if (has_local_mods
> + && merge_outcome != svn_wc_merge_unchanged)
> *content_state = svn_wc_notify_state_merged;
> else if (merge_outcome == svn_wc_merge_merged)
> *content_state = svn_wc_notify_state_changed;
>
> Modified: branches/1.4.x-r24755/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/branches/1.4.x-r24755/subversion/tests/cmdline/merge_tests.py?pathrev=24762&r1=24761&r2=24762
> ==============================================================================
> --- /branches/1.4.x/subversion/tests/cmdline/merge_tests.py (original)
> +++ branches/1.4.x-r24755/subversion/tests/cmdline/merge_tests.py Tue Apr 24 13:03:51 2007
> @@ -215,7 +215,6 @@
> # case 4, which we'll handle in a second pass.
> expected_output = wc.State(other_wc, {'A/B/lambda' : Item(status='U '),
> 'A/D/G/rho' : Item(status='U '),
> - 'A/D/G/pi' : Item(status='G '),
> 'A/D/G/tau' : Item(status='C '),
> })
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org