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

On Tue, 24 Apr 2007, Hyrum K. Wright wrote:
...
> r24755 | cmpilato | 2007-04-24 11:05:03 -0500 (Tue, 24 Apr 2007) | 14 lines
> Changed paths:
> M /trunk/subversion/libsvn_subr/path.c
> M /trunk/subversion/tests/libsvn_subr/path-test.c
> ...
>
> The 1.4.x-24755 branch below looks like it contains a different change
> than r24755.

Yeah, oops. This is for r24483. I reverted my local copy of STATUS,
which caused pending changes to move around, and me to cut-n-paste the
wrong revnum. Branch renamed in r24766, thanks.

>
> > 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 '),
> > })
> >
>
> -Hyrum
>