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

Re: [PATCH]: Add 'replaced' value to ConflictDescriptor.Reason

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 19 Jun 2012 18:40:26 +0200

On Mon, Jun 18, 2012 at 09:10:41PM +0200, Dmitry Pavlenko wrote:
> Hi,
>
> enum svn_wc_conflict_reason_t has 10 possible values but ConflictDescriptor.Reason from javahl only 6;
> as I understand this is because some of svn_wc_conflict_reason_t values are "experimental" (for 1.8);
> but anyway at least 1 of those values is released (svn_wc_conflict_reason_replaced that is for 1.7). So a corresponding value should be added to javahl.
>
> If you accept this patch, I would also ask you to backport it to branches/1.7.x.

Thank you! Committed in r1351772, with tweaks as per #svn-dev IRC.
I'll nominate this for backport shortly.
Received on 2012-06-19 21:12:59 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.