> -----Original Message-----
> From: s...@apache.org [mailto:s...@apache.org]
> Sent: vrijdag 15 juni 2012 23:04
> To: comm...@subversion.apache.org
> Subject: svn commit: r1350795 - in /subversion/trunk/subversion:
> libsvn_client/update.c tests/cmdline/update_tests.py
>
> Author: stsp
> Date: Fri Jun 15 21:03:35 2012
> New Revision: 1350795
>
> URL: http://svn.apache.org/viewvc?rev=1350795&view=rev
> Log:
> Invoke the interactive conflict resolution callback after an update operation,
> instead of during an update operation.
While +1 on the concept I want to note that this currently breaks the handling
of property conflicts.
As there is no storage for property conflicts yet the only thing you can do at
a later time is resolve it to working or revert all the property changes.
Before this patch individual property conflicts could be handled.
I hope and assume we can fix this before 1.8 with a/the new conflict storage.
Bert
