Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 58842200B99 for ; Wed, 5 Oct 2016 21:50:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 57156160ADE; Wed, 5 Oct 2016 19:50:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9DB3F160AC9 for ; Wed, 5 Oct 2016 21:50:05 +0200 (CEST) Received: (qmail 67870 invoked by uid 500); 5 Oct 2016 19:50:04 -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 67856 invoked by uid 99); 5 Oct 2016 19:50:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Oct 2016 19:50:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 4FBC518023E for ; Wed, 5 Oct 2016 19:50:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id SvOkmZoS7BKL for ; Wed, 5 Oct 2016 19:50:03 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id A0E575F399 for ; Wed, 5 Oct 2016 19:50:03 +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 1F9FBE017A for ; Wed, 5 Oct 2016 19:50: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 1C7413A00EC for ; Wed, 5 Oct 2016 19:50:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1762631 - svn:log Date: Wed, 05 Oct 2016 19:50:03 -0000 To: commits@subversion.apache.org From: kotkov@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161005195003.1C7413A00EC@svn01-us-west.apache.org> archived-at: Wed, 05 Oct 2016 19:50:06 -0000 Author: kotkov Revision: 1762631 Modified property: svn:log Modified: svn:log at Wed Oct 5 19:50:03 2016 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Oct 5 19:50:03 2016 @@ -6,5 +6,5 @@ file from disk after recording a move in running a meta-data only move. * subversion/tests/libsvn_client/conflicts-test.c - (test_option_merge_incoming_move_file_text_merge): Extend the test with + (test_merge_incoming_move_file_text_merge): Extend the test with another check that fails without this fix.