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 1D4FC825D for ; Wed, 10 Aug 2011 13:35:02 +0000 (UTC) Received: (qmail 6278 invoked by uid 500); 10 Aug 2011 13:35:02 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 6230 invoked by uid 500); 10 Aug 2011 13:35:01 -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 6223 invoked by uid 99); 10 Aug 2011 13:35:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Aug 2011 13:35:01 +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; Wed, 10 Aug 2011 13:34:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B154023889E5 for ; Wed, 10 Aug 2011 13:34:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1156176 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/wc-queries.sql subversion/tests/cmdline/changelist_tests.py Date: Wed, 10 Aug 2011 13:34:37 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110810133437.B154023889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Wed Aug 10 13:34:37 2011 New Revision: 1156176 URL: http://svn.apache.org/viewvc?rev=1156176&view=rev Log: Merge r1156085, r1156098 from trunk: * r1156085, r1156098 Resolve issue #3985, "Re: 1.7 corrupts WC when reverting add of changelist member", by fixing a query Justification: Breaking working copies by reverting is unexpected behavior. Notes: r1156085 adds an XFail testcase and r1156098 resolves this issue. Votes: +1: rhuijben, philip, hwright Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql subversion/branches/1.7.x/subversion/tests/cmdline/changelist_tests.py Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 10 13:34:37 2011 @@ -55,4 +55,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1156085,1156098 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1156176&r1=1156175&r2=1156176&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 10 13:34:37 2011 @@ -231,13 +231,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1156085, r1156098 - Resolve issue #3985, "Re: 1.7 corrupts WC when reverting add of changelist - member", by fixing a query - Justification: - Breaking working copies by reverting is unexpected behavior. - Notes: - r1156085 adds an XFail testcase and r1156098 resolves this issue. - Votes: - +1: rhuijben, philip, hwright Modified: subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql?rev=1156176&r1=1156175&r2=1156176&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/wc-queries.sql Wed Aug 10 13:34:37 2011 @@ -603,8 +603,8 @@ WHERE wc_id = ?1 AND local_relpath = ?2 AND (changelist IS NULL OR NOT EXISTS (SELECT 1 FROM nodes_current c - WHERE c.wc_id = ?1 AND c.local_relpath = local_relpath - AND kind = 'file')) + WHERE c.wc_id = ?1 AND c.local_relpath = ?2 + AND c.kind = 'file')) -- STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE DELETE FROM actual_node @@ -614,8 +614,9 @@ WHERE wc_id = ?1 OR (local_relpath > ?2 || '/' AND local_relpath < ?2 || '0')) AND (changelist IS NULL OR NOT EXISTS (SELECT 1 FROM nodes_current c - WHERE c.wc_id = ?1 AND c.local_relpath = local_relpath - AND kind = 'file')) + WHERE c.wc_id = ?1 + AND c.local_relpath = actual_node.local_relpath + AND c.kind = 'file')) -- STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST UPDATE actual_node Modified: subversion/branches/1.7.x/subversion/tests/cmdline/changelist_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/changelist_tests.py?rev=1156176&r1=1156175&r2=1156176&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/tests/cmdline/changelist_tests.py (original) +++ subversion/branches/1.7.x/subversion/tests/cmdline/changelist_tests.py Wed Aug 10 13:34:37 2011 @@ -1170,6 +1170,26 @@ def add_remove_unversioned_target(sbox): 'changelist', unversioned, '--remove') +@Issue(3985) +def readd_after_revert(sbox): + "add new file to changelist, revert and readd" + sbox.build(read_only = True) + + dummy = sbox.ospath('dummy') + svntest.main.file_write(dummy, "dummy contents") + + sbox.simple_add('dummy') + svntest.actions.run_and_verify_svn(None, None, [], + 'changelist', 'testlist', + dummy) + + sbox.simple_revert('dummy') + + svntest.main.file_write(dummy, "dummy contents") + + svntest.actions.run_and_verify_svn(None, None, [], + 'add', dummy) + ######################################################################## # Run the tests @@ -1192,6 +1212,7 @@ test_list = [ None, revert_deleted_in_changelist, add_remove_non_existent_target, add_remove_unversioned_target, + readd_after_revert, ] if __name__ == '__main__':