[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Hyrum K. Wright <hyrum_at_hyrumwright.org>
Date: Sat, 22 Aug 2009 10:23:01 +0200

On Aug 22, 2009, at 2:47 AM, Neels Janosch Hofmeyr wrote:

> 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 could be wrong, but I think those values are considered part of the
public API, and therefore shouldn't be added in a patch release.

>
> 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

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386236
Received on 2009-08-22 10:23:30 CEST

This is an archived mail posted to the Subversion Dev mailing list.