Re: svn commit: rev 4023 - trunk/subversion/libsvn_client

On Thu, Dec 05, 2002 at 09:35:36PM -0600, Ben Collins-Sussman wrote:
> kraai@tigris.org writes:
>
> > Author: kraai
> > Date: 2002-12-05 20:57:21 -0600 (Thu, 05 Dec 2002)
> > New Revision: 4023
> >
> > Modified:
> > trunk/subversion/libsvn_client/diff.c
> > Log:
> > Fix issue #1012.
> >
> > * subversion/libsvn_client/diff.c
> > (do_single_file_merge): Only merge regular properties.
>
> Hey Matt, does this commit fix the bug I filed last week, issue #1012?
> If so, do you wanna close it?

Yes and yes.

It doesn't address the propdel problems you noted in the followup
comment, however.

Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 6 17:27:22 2002