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 021B118011 for ; Tue, 4 Aug 2015 10:50:08 +0000 (UTC) Received: (qmail 51929 invoked by uid 500); 4 Aug 2015 10:50:07 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51897 invoked by uid 500); 4 Aug 2015 10:50:07 -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 51887 invoked by uid 99); 4 Aug 2015 10:50:07 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2015 10:50:07 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BE2DBAC0295 for ; Tue, 4 Aug 2015 10:50:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1694030 - in /subversion/branches/patch-exec/subversion: include/svn_diff.h tests/cmdline/patch_tests.py Date: Tue, 04 Aug 2015 10:50:07 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150804105007.BE2DBAC0295@hades.apache.org> Author: danielsh Date: Tue Aug 4 10:50:07 2015 New Revision: 1694030 URL: http://svn.apache.org/r1694030 Log: On the patch-exec branch: Housekeeping. * subversion/include/svn_diff.h (svn_patch_t.old_executable_p, svn_patch_t.new_executable_p): Add forgotten doxygen @since markup, forgotten in r1692718. * subversion/tests/cmdline/patch_tests.py (patch_adds_executability_nocontents, patch_adds_executability_yescontents): Fix copy-paste error. Modified: subversion/branches/patch-exec/subversion/include/svn_diff.h subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py Modified: subversion/branches/patch-exec/subversion/include/svn_diff.h URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/include/svn_diff.h?rev=1694030&r1=1694029&r2=1694030&view=diff ============================================================================== --- subversion/branches/patch-exec/subversion/include/svn_diff.h (original) +++ subversion/branches/patch-exec/subversion/include/svn_diff.h Tue Aug 4 10:50:07 2015 @@ -1254,6 +1254,8 @@ typedef struct svn_patch_t { * * #svn_tristate_unknown indicates the patch does not specify the * corresponding bit. + * + * @since New in 1.10. */ /* ### This is currently not parsed out of "index" lines (where it * ### serves as an assertion of the executability state, without Modified: subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py?rev=1694030&r1=1694029&r2=1694030&view=diff ============================================================================== --- subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py (original) +++ subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py Tue Aug 4 10:50:07 2015 @@ -5634,7 +5634,6 @@ def patch_adds_executability_nocontents( patch_file_path = make_patch_path(sbox) svntest.main.file_write(patch_file_path, unidiff_patch) - ### Patch applies through the unversioned symlink expected_output = [ ' U %s\n' % sbox.ospath('iota'), ] @@ -5677,7 +5676,6 @@ def patch_adds_executability_yescontents patch_file_path = make_patch_path(sbox) svntest.main.file_write(patch_file_path, unidiff_patch) - ### Patch applies through the unversioned symlink expected_output = [ 'UU %s\n' % sbox.ospath('A/mu'), ]