Re: svn commit: rev 4799 - in trunk/subversion: libsvn_client tests/clients/cmdline

dwhedon@tigris.org writes:
> Log:
> Fix issue #1109.
>
> * subversion/libsvn_client/diff.c (do_single_file_merge) : Switch order of
> property hashes in call to svn_wc_get_local_propchanges(). The diff was
> being generated backwards causing add property events to look like delete
> property events. This resulted in broken property merges.
>
> * subversion/tests/clients/cmdline/merge_tests.py (simple_property_merges) :
> Add test case to catch broken single file property merges.

You r0x0r, dude. And a regression test, even! Ahhhh.

<contented purr>,
-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 10 22:23:48 2003