Re: svn commit: r38907 - in trunk/subversion: libsvn_client libsvn_wc tests/cmdline

Stefan Sperling wrote:
> Author: stsp
> Date: Fri Aug 21 13:57:01 2009
> New Revision: 38907
>
> Log:
> Use conflict action and reason types for replaced items added in r38903
> when flagging and reporting tree conflicts during update and merge.

w00t!

Guys, I see you've been quite busy on this one while I was away. I'll try
and see what needs to be done to finish this one off.

Thanks, Julian, Stephen, for spotting the bogus merge in merge_tests.py.

BTW, is it possible to backport the addition of the 'replaced' action/reason
to 1.6.x?

I'm trying to keep track of which revisions would need to be backported...

r38000, r38006, r38099, r38100, r38181,
r38803, r38872, r38896, r38903, 38907

where r38872 has already been nominated.

~Neels

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386180