Re: svn commit: r12386 - in branches/1.1.x: . subversion/libsvn_client subversion/libsvn_ra_dav subversion/mod_dav_svn

On Saturday 18 December 2004 21:02, Justin Erenkrantz wrote:
> --On Saturday, December 18, 2004 8:07 PM -0500 John Szakmeister
>
> <john@szakmeister.net> wrote:
> > This commit broke the 1.1.x branch. In particular,
> > svn_wc_prop_set2() doesn't exist in 1.1.x, as indicated by the recent
> > failures. :-)
>
> That last line calling svn_wc_prop_set2() shouldn't have been there.
> libsvn_diff got overly greedy in the merge and I didn't catch it.
>
> Sorry. I'll merge it back. -- justin

No problem. I just wanted to point it out the problem so it could be
fixed. :-)

I am a bit concerned that merge inserted a line that wasn't present in the
original diff though. We should *never* do that. I wonder where it's
breaking down?

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 19 13:07:30 2004