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 9C373178C2 for ; Thu, 28 Jan 2016 16:59:39 +0000 (UTC) Received: (qmail 4878 invoked by uid 500); 28 Jan 2016 16:59:05 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 4846 invoked by uid 500); 28 Jan 2016 16:59:05 -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 4835 invoked by uid 99); 28 Jan 2016 16:59:05 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jan 2016 16:59:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 389E7C0D58 for ; Thu, 28 Jan 2016 16:59:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id vMffLgz-qmpN for ; Thu, 28 Jan 2016 16:59:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 48B5F210B2 for ; Thu, 28 Jan 2016 16:59:04 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 662B0E0185 for ; Thu, 28 Jan 2016 16:59:03 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 665EB3A0051 for ; Thu, 28 Jan 2016 16:59:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1727405 - svn:log Date: Thu, 28 Jan 2016 16:59:03 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160128165903.665EB3A0051@svn01-us-west.apache.org> Author: stsp Revision: 1727405 Modified property: svn:log Modified: svn:log at Thu Jan 28 16:59:03 2016 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Jan 28 16:59:03 2016 @@ -1,3 +1,3 @@ * subversion/libsvn_client/resolved.c (svn_client_conflict_get_conflicted): Satisfy docstring's requirement and - return an empty array if there are no conflict properties. + return an empty array if there are no conflicted properties.