Return-Path: X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CBFA311991 for ; Fri, 20 Jun 2014 15:49:26 +0000 (UTC) Received: (qmail 9751 invoked by uid 500); 20 Jun 2014 15:49:26 -0000 Delivered-To: apmail-subversion-dev-archive@subversion.apache.org Received: (qmail 9700 invoked by uid 500); 20 Jun 2014 15:49:26 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 9678 invoked by uid 99); 20 Jun 2014 15:49:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 15:49:25 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy includes SPF record at spf.trusted-forwarder.org) Received: from [98.138.120.50] (HELO nm43.bullet.mail.ne1.yahoo.com) (98.138.120.50) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jun 2014 15:49:20 +0000 Received: from [127.0.0.1] by nm43.bullet.mail.ne1.yahoo.com with NNFMP; 20 Jun 2014 15:48:58 -0000 Received: from [98.138.100.115] by nm43.bullet.mail.ne1.yahoo.com with NNFMP; 20 Jun 2014 15:46:03 -0000 Received: from [212.82.98.40] by tm106.bullet.mail.ne1.yahoo.com with NNFMP; 20 Jun 2014 15:46:02 -0000 Received: from [212.82.98.35] by tm1.bt.bullet.mail.ir2.yahoo.com with NNFMP; 20 Jun 2014 15:46:02 -0000 Received: from [127.0.0.1] by omp1004.bt.mail.ir2.yahoo.com with NNFMP; 20 Jun 2014 15:46:02 -0000 X-Yahoo-Newman-Property: ymail-4 X-Yahoo-Newman-Id: 627021.32099.bm@omp1004.bt.mail.ir2.yahoo.com Received: (qmail 24305 invoked by uid 60001); 20 Jun 2014 15:39:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=btopenworld.com; s=s1024; t=1403278761; bh=0wXdo84x3Vas/Z1w09JspMjGCgvTe/4JZE9LYenBQGo=; h=References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=1Ni3mrEx55oDLuvfHLSTHYI/mT3kMPyCqbu1kuQWkIXwZCKapbDwQggWX9rIH7sfvuaH96U6jrVxWnlMV5MrvG2bLMiAkczD4SAYNWSc2+chAblWAP2FwW8PR6H6uXhp0+OE24n0lpjy7Qt/F6SPLxB/1zcKYGiyRBSkNf3B//8= X-YMail-OSG: NU226KgVM1mVuYKoyrG.A6mLyZkjzQlEl.t71fvh7.xFEeC hr27wqv2jzdJ_lqm7r2yJIQwBZCivw5Q7sgB6eNdXvJJwl2FpwSNiY7ypNoo tWHu7W4llPZvpXDmoraPjL.Qwr8Wm0GGIs.sXitmTpLhj.x_.osNDmNyh_D7 FZpY9zOwm2iWqZPeQbuUVMKfRfgQQTuE5F9s.7YueFkVNpsViQ69JVpCa3lN ddQdawD_cmgypcHPVfI.n9rbRykSJNgK.raapBbLWJse_D2B.fjAh5IewlOj EFrtaoZsTevfrqhYgbQsLJZL1YT82bWlZBuxyG7GZkvssRJQ5.EI5T1.NGG0 9DS_7z7tW_ca1G9WOzz1wlItjfmpv0F0YUvZFfJybcth0qytL1s.cnWl0BNL JZphWZwlfNX32BAzSeUiGWjwsFzfhconMiXsZn_NJ_b462QmqRPbiF69GXWh x.Mq_d8LcFE0lNmC0Dn4fySE61252cLhshJK24ZOzM3rZGdhcHYj_FGRf3_. e1rVuhNMUdjhfDyVh0uPtJfLsPg.YNryTAn7nPuuMnfe3MBy1mp_RG4UAMuY BMZTMXK3CLbEYXVjVnJVExv3VbgAr11xvSS5YZiOv0uhT.0yel6jrkpwQ91. KvaGlaDSAjMnmyV23Vy4j2bn_PLOJAklQl5dlrRHyVrsrliL4TD8D70SM1Na y2mH62KZDtMn7T0MQipoq2IrWqaQ0oz9FQ0v.24tEhtYrZH4xFwYYfjrSg2t BxBcIgntz Received: from [146.200.29.179] by web87701.mail.ir2.yahoo.com via HTTP; Fri, 20 Jun 2014 16:39:21 BST X-Rocket-MIMEInfo: 002.001,TWFya3VzIFNjaGFiZXIgd3JvdGU6Cgo.IFNlY29uZCBpdGVyYXRpb24gb2YgbXkgcGF0Y2ggZm9yIGZpeGluZyBpc3N1ZSAjNDM5NS4KPiBodHRwOi8vc3VidmVyc2lvbi50aWdyaXMub3JnL2lzc3Vlcy9zaG93X2J1Zy5jZ2k_aWQ9NDM5NQoKVGhlIGlzc3VlIHJlcG9ydCBpcyB1bmNsZWFyLiBXaGF0IGFyZSB0aGUgJ2Zyb20nIGFuZCAndG8nIHZlcnNpb25zIG1lYW50IHRvIGJlPyBJcyB0aGUgcmVwcm8gcmVjaXBlICBtZWFudCB0byBjaGVjayBvdXQgd2l0aCAxLjYgYW5kIHRoZW4gdXBncmFkZSB0byAxLjcBMAEBAQE- X-Mailer: YahooMailWebService/0.8.191.1 References: <727D8E16AE957149B447FE368139F2B539BFEB73@SERVER10> <727D8E16AE957149B447FE368139F2B539BFEC09@SERVER10> Message-ID: <1403278761.59443.YahooMailNeo@web87701.mail.ir2.yahoo.com> Date: Fri, 20 Jun 2014 16:39:21 +0100 From: Julian Foad Reply-To: Julian Foad Subject: Re: AW: [Patch] Fix for Issue #4395: 'svn upgrade' loses 1.6-client format files To: Markus Schaber Cc: "Subversion Dev \(dev@subversion.apache.org\)" In-Reply-To: <727D8E16AE957149B447FE368139F2B539BFEC09@SERVER10> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Markus Schaber wrote:=0A=0A> Second iteration of my patch for fixing issue = #4395.=0A> http://subversion.tigris.org/issues/show_bug.cgi?id=3D4395=0A=0A= The issue report is unclear. What are the 'from' and 'to' versions meant to= be? Is the repro recipe meant to check out with 1.6 and then upgrade to 1= .7? As written it appears to check out with 1.7 and upgrade to ... unspecif= ied.=0A=0AIs this fix intended for all of: 1.7, 1.8 and trunk?=0A=0A- Julia= n=0A=0A=0A> The fix itself is actually unchanged, but I added a test case= =0A> which upgrades some working copies of different formats and=0A> checks= whether the "format" and "entries" files are present=0A> and correct.=0A> = =0A> [[[=0A> Fix issue 4395 by not deleting the format and entries file whe= n we =0A> upgrade from an 1.7 working copy.=0A> =0A> * subversion/libsvn_wc= /upgrade.c=0A> =A0 (wipe_obsolete_files): Add a boolean parameter remove_fo= rmat_entries=0A> =A0 =A0 declaring whether we should wipe format and entry = files.=0A> =A0 (svn_wc__wipe_postupgrade): Pass TRUE for remove_format_entr= ies to=0A> =A0 =A0 keep the old behavior for pre-1.7 working copies.=0A> = =A0 (svn_wc__upgrade_sdb): Pass FALSE for remove_format_entries to keep=0A>= =A0 =A0 the files when upgrading from an 1.7 (or newer) working copy.=0A> = =0A> * subversion/tests/cmdline/upgrade_tests.py=0A> =A0 (upgrade_dropped_s= tatus_entries_files): Add a new test case to check=0A> =A0 =A0 that the "en= tries" and "format" files are retained =0A> during upgrade.=0A> ]]]