From commits-return-48489-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Fri Mar 2 03:06:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AA5E918064D for ; Fri, 2 Mar 2018 03:06:06 +0100 (CET) Received: (qmail 6141 invoked by uid 500); 2 Mar 2018 02:06: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 6127 invoked by uid 99); 2 Mar 2018 02:06:05 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2018 02:06:05 +0000 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 9AF393A009D for ; Fri, 2 Mar 2018 02:06:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1825694 - /subversion/trunk/subversion/tests/cmdline/update_tests.py Date: Fri, 02 Mar 2018 02:06:03 -0000 To: commits@subversion.apache.org From: jamessan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180302020604.9AF393A009D@svn01-us-west.apache.org> Author: jamessan Date: Fri Mar 2 02:06:03 2018 New Revision: 1825694 URL: http://svn.apache.org/viewvc?rev=1825694&view=rev Log: * subversion/tests/cmdline/update_test.py: (update_keywords_on_shortcut): Add @Issue(4585) annotation Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1825694&r1=1825693&r2=1825694&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Mar 2 02:06:03 2018 @@ -6719,6 +6719,7 @@ def update_conflict_details(sbox): # Keywords should be updated in local file even if text change is shortcut # (due to the local change being the same as the incoming change, for example). @XFail() +@Issue(4585) def update_keywords_on_shortcut(sbox): "update_keywords_on_shortcut"