Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A12D6DD05 for ; Tue, 19 Jun 2012 19:16:36 +0000 (UTC) Received: (qmail 86382 invoked by uid 500); 19 Jun 2012 19:11:08 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 65514 invoked by uid 500); 19 Jun 2012 19:09:44 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 31320 invoked by uid 99); 19 Jun 2012 16:39:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 16:39:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jun 2012 16:39:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 721762388DB4; Tue, 19 Jun 2012 16:39:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351772 - /subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Date: Tue, 19 Jun 2012 16:39:14 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120619163914.721762388DB4@eris.apache.org> Author: stsp Date: Tue Jun 19 16:39:14 2012 New Revision: 1351772 URL: http://svn.apache.org/viewvc?rev=1351772&view=rev Log: In JavaHL, add missing 'replaced' value to ConflictDescriptor.Reason, corresponding to svn_wc_conflict_reason_replaced; and add 'replace' to ConflictDescriptor.Action, corresponding to svn_wc_conflict_action_replace. These values are new in Subversion 1.7 but we forgot to add them to JavaHL. * subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (Action): Add 'replace'. (Reason): Add 'replaced'. Patch by: Dmitry Pavlenko me Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1351772&r1=1351771&r2=1351772&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original) +++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Tue Jun 19 16:39:14 2012 @@ -204,7 +204,12 @@ public class ConflictDescriptor /** * Attempting to delete object. */ - delete; + delete, + + /** + * Attempting to replace object. + */ + replace; } /** @@ -240,7 +245,12 @@ public class ConflictDescriptor /** * Object is already added or schedule-add. */ - added; + added, + + /** + * Object is already replaced. + */ + replaced; } public enum Operation