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 A983A9FEF for ; Fri, 11 May 2012 22:06:41 +0000 (UTC) Received: (qmail 81258 invoked by uid 500); 11 May 2012 22:06:41 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 81236 invoked by uid 500); 11 May 2012 22:06:41 -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 81227 invoked by uid 99); 11 May 2012 22:06:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 May 2012 22:06:41 +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; Fri, 11 May 2012 22:06:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6D1C1238896F; Fri, 11 May 2012 22:06:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1337394 - in /subversion/trunk/subversion: libsvn_client/commit_util.c tests/cmdline/lock_tests.py Date: Fri, 11 May 2012 22:06:20 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120511220620.6D1C1238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Fri May 11 22:06:19 2012 New Revision: 1337394 URL: http://svn.apache.org/viewvc?rev=1337394&view=rev Log: Resolve an unmodified file unlock regression in the commit harvester. * subversion/tests/cmdline/lock_tests.py (commit_file_unlock): Extend test to also try to unlock an unmodified file. * subversion/libsvn_client/commit_util.c (harvest_status_callback): Handle unmodified but locked nodes when releasing locks. Modified: subversion/trunk/subversion/libsvn_client/commit_util.c subversion/trunk/subversion/tests/cmdline/lock_tests.py Modified: subversion/trunk/subversion/libsvn_client/commit_util.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1337394&r1=1337393&r2=1337394&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/commit_util.c (original) +++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri May 11 22:06:19 2012 @@ -616,7 +616,8 @@ harvest_status_callback(void *status_bat case svn_wc_status_none: return SVN_NO_ERROR; case svn_wc_status_normal: - if (!copy_mode && !status->conflicted) + if (!copy_mode && !status->conflicted + && !(just_locked && status->lock)) return SVN_NO_ERROR; break; default: Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1337394&r1=1337393&r2=1337394&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri May 11 22:06:19 2012 @@ -159,19 +159,21 @@ def commit_file_unlock(sbox): wc_dir = sbox.wc_dir fname = 'A/mu' - file_path = os.path.join(sbox.wc_dir, fname) + file_path = sbox.ospath(fname) - # lock fname as wc_author + # lock fname and iota as wc_author svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock', - '-m', 'some lock comment', file_path) + '-m', 'some lock comment', + sbox.ospath(fname), + sbox.ospath('iota')) # make a change and commit it, allowing lock to be released svntest.main.file_append(file_path, "Tweak!\n") - svntest.main.run_svn(None, 'commit', '-m', '', - file_path) + svntest.main.run_svn(None, 'commit', '-m', '', wc_dir) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak(fname, wc_rev=2) + expected_status.tweak('iota', wc_rev=2) # Make sure the file is unlocked svntest.actions.run_and_verify_status(wc_dir, expected_status)