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

On Sun, Aug 23, 2009 at 01:39:20AM +0200, Neels J Hofmeyr wrote:
> Hyrum K. Wright wrote:
> >> 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.
>
> Indeed, no way denying it. Humph.
> So to fix this in 1.6.x, we need a "half-fix" on a branch.

My plan for 1.6.x was to add new conflict_{action,reason}_t types in
include/private somewhere and use them instead of the public ones.

As soon as we're happy with what we've got on trunk, I am going to make
a backport branch and merge all required revisions into it.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2386515
Received on 2009-08-23 16:56:48 CEST