Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D8AEADFF2 for ; Thu, 16 Aug 2012 16:33:10 +0000 (UTC) Received: (qmail 81401 invoked by uid 500); 16 Aug 2012 16:33:10 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 81381 invoked by uid 500); 16 Aug 2012 16:33:10 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 81374 invoked by uid 99); 16 Aug 2012 16:33:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2012 16:33:10 +0000 X-ASF-Spam-Status: No, hits=2.5 required=5.0 tests=FREEMAIL_FORGED_REPLYTO,FSL_FREEMAIL_1,FSL_FREEMAIL_2,RCVD_IN_DNSWL_NONE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [98.138.91.61] (HELO nm26-vm1.bullet.mail.ne1.yahoo.com) (98.138.91.61) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 16 Aug 2012 16:33:00 +0000 Received: from [98.138.90.54] by nm26.bullet.mail.ne1.yahoo.com with NNFMP; 16 Aug 2012 16:32:39 -0000 Received: from [98.138.87.9] by tm7.bullet.mail.ne1.yahoo.com with NNFMP; 16 Aug 2012 16:32:39 -0000 Received: from [127.0.0.1] by omp1009.mail.ne1.yahoo.com with NNFMP; 16 Aug 2012 16:32:39 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 707981.2154.bm@omp1009.mail.ne1.yahoo.com Received: (qmail 41749 invoked by uid 60001); 16 Aug 2012 16:32:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1345134759; bh=xYoNv8KHY1xZT5AJBKyk+qDlmIFbU5gBy+HC2uWMfP0=; h=X-YMail-OSG:Received:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=RkM9YRc5oYGoFU7pDY84kkgQ9/0QfiKY8BBQ6p2/5eF8LbS4Xyn0WrVCDtwHlzSFmcEShh84eIivwfsMlzY9Bo4SVF4Bkrz9Pbet2ymEItkL8p+kB9rEO8tKex5x+EGk//FLHkpIp88yA+7aHjI0FoQ5PadcKuaI+vboxvWVw3A= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=X-YMail-OSG:Received:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=JLlCarsV1YxBrlMuCW1r5l6eYfJ1uRdShgEcYhc4WxsvxobkMgPZZq394wrRYDFzjC1LWjb4MAkY1LLicH/+4ERywN9corK0Ozq7Od2EqAhSELMEJHjsCM+gJw7DKvYc/NBQzPhavmcmdPGnEMvjFvMTbGpsN4BSNF1FXoE+3Ss=; X-YMail-OSG: 6FlFqX8VM1lMSoNch7Abm6P6BhD.tynfUMsC8EKUvIJRqXw 51_PjuMxLmoQI2gb1vsfMTmIhOLl2x66nEmmo5SeDviC2Vp4dBDfShLmjExd GmwnXFzBn5gRLuvpBET9F3tCwHP10VozD1fXMF8mXsvvrkVGHJdDkUgjF6vK BCLC4CNn1LoosjrW4ter5ROMjfs7aQ6MmeJ.cpKExS8E4d_eHdNquQNw_gSq hUpsJ.kRAkldkFcvcEUhWZvW2RQY0IQWm1hSus.JRIN0sSBGgCzcaCO3.8ht MiSu1POrpEF_gnU5.R9yeu9cjRZu1rFXZiQJDwAAORD37Rm7orHzFvQl3icx XqrlVoVjv_9v_BCrNbyTGOTVb26L7oMDRrh8OX7yt7PFP0XjnBDXmgZ5STby ynRzb59udAsobAwyX9GdgHivbcpsQ._203y8HxIzDZw-- Received: from [168.215.167.226] by web121902.mail.ne1.yahoo.com via HTTP; Thu, 16 Aug 2012 09:32:39 PDT X-Mailer: YahooMailWebService/0.8.120.356233 References: <1345096853.83648.YahooMailClassic@web121902.mail.ne1.yahoo.com> Message-ID: <1345134759.41602.YahooMailNeo@web121902.mail.ne1.yahoo.com> Date: Thu, 16 Aug 2012 09:32:39 -0700 (PDT) From: Robert Whitaker Reply-To: Robert Whitaker Subject: Re: Creating sparse working copy retroactively from existing disjoint working copies To: "users@subversion.apache.org" In-Reply-To: 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 > From: Johan Corveleyn =0A> Sent: Thursday, August 16, = 2012 2:38 AM=0A>=0A> [ snip ]=0A>=0A> Can you try:=0A>=0A> $ svn update --d= epth immediates /svn-test/mom/daughter=0A>=0A> That might connect granddaug= hter1 to daughter, with an E notification.=0A> It might also pull in other = siblings of granddaughter1 of course, but=0A> only the directories themselv= es, not the entire subtrees.=0A>=0A=0AHello Johan,=0A=0AThanks for the repl= y... I tried using "immediates" but it did not work...=0AI tried using both= "--depth" and "--set-depth" with different results but =0Aneither worked. = I have two copy-and-pasted sessions below. The first one=0Atries using "imm= ediates", and the second is another "hack" which fools svn =0Ainto checking= out the directory.=0A=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ASESSION #1: (usin= g immediates)=0A=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0AThe following is a copy-an= d-pasted svn session which tries to solve=0Aour problem using the "immediat= es" option:=0A=0A---o---=0A$ # Confirm "svn status" does not recognize "gra= nddaughter1"=0A=0A$ svn status /svn-test-2/mom/=0A?=A0=A0=A0=A0=A0=A0 /svn-= test-2/mom/daughter/granddaughter1=0A=0A$ # Try Johan's suggestion=0A=0A$ s= vn update --depth immediates /svn-test-2/mom/daughter=0AAt revision 85801.= =0A=0A$ svn status /svn-test-2/mom/=0A?=A0=A0=A0=A0=A0=A0 /svn-test-2/mom/d= aughter/granddaughter1=0A=0A$ # Ooops... the "svn status" command still fai= ls as shown above=0A=0A$ # Now try --set-depth=0A=0A$ svn update --set-dept= h immediates /svn-test-2/mom/daughter=0Asvn: Failed to add directory '/svn-= test-2/mom/daughter/granddaughter1': =0Aa versioned directory of the same n= ame already exists=0A=0A$ # Now try --set-depth with --force flag=0A=0A$ sv= n update --set-depth immediates --force /svn-test-2/mom/daughter=0Asvn: Fai= led to add directory '/svn-test-2/mom/daughter/granddaughter1': =0Aa versio= ned directory of the same name already exists=0A=0A$ # NOTE 1: svn recogniz= es "granddaughter1" is versioned=0A=0A$ # NOTE 2: svn still fails to connec= t to "daughter"=0A=0A$ # NOTE 3: We still have a problem!=0A---o---=0A=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0ASESSION #2: (using hack to fool svn)=0A=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=0AThe following is a copy-and-pasted svn sessio= n which solves=0Aour problem using a "hack" to fool svn... it would be nice= to=0Ahave an "official" way of fixing this problem:=0A=0A---o---=0A$ # Mad= e some local changes to "granddaughter1" as a test=0A=0A$ svn status /svn-t= est-3/mom/daughter/granddaughter1=0A?=A0=A0=A0=A0=A0=A0 /svn-test-3/mom/dau= ghter/granddaughter1/bunny3.txt=0AM=A0=A0=A0=A0=A0=A0 /svn-test-3/mom/daugh= ter/granddaughter1/bunny2.txt=0A=0A$ # Confirm "daughter" still not linked = to "granddaughter1"=0A=0A$ svn status /svn-test-3/mom/daughter=0A?=A0=A0=A0= =A0=A0=A0 /svn-test-3/mom/daughter/granddaughter1=0A=0A$ # Move "granddaugh= ter1" directory to fool svn=0A=0A$ mv /svn-test-3/mom/daughter/granddaughte= r1 /svn-test-3/=0A=0A$ svn status /svn-test-3/mom/daughter=0A=0A$ # The "da= ughter" directory is now OK as shown by "svn status" above=0A=0A$ # The "da= ughter" directory is empty because we moved "granddaughter1"=0A=0A$ ls -al = /svn-test-3/mom/daughter/=0Atotal 4=0Adrwxr-xr-x+ 1 capnwhit Domain Users 0= Aug 16 10:59 .=0Adrwxr-xr-x+ 1 capnwhit Domain Users 0 Aug 16 10:17 ..=0Ad= rwxr-xr-x+ 1 capnwhit Domain Users 0 Aug 16 10:22 .svn=0A=0A$ # Now repeat = STEP 10 in original email with "--depth infinity"=0A=0A$ svn update --depth= infinity /svn-test-3/mom/daughter/granddaughter1=0AA=A0=A0=A0 /svn-test-3/= mom/daughter/granddaughter1=0AA=A0=A0=A0 /svn-test-3/mom/daughter/granddaug= hter1/bunny1.txt=0AA=A0=A0=A0 /svn-test-3/mom/daughter/granddaughter1/bunny= 2.txt=0AUpdated to revision 85801.=0A=0A$ # It works as expected=0A=0A$ # T= he "daughter" and "granddaughter1" are now connected=0A=0A$ svn status /svn= -test-3/mom/daughter=0A=0A$ # Now we remove the recently added "granddaught= er1"=0A=0A$ rm -rf /svn-test-3/mom/daughter/granddaughter1/=0A=0A$ # Verify= that svn recognizes missing directory=0A=0A$ svn status /svn-test-3/mom=0A= !=A0=A0=A0=A0=A0=A0 /svn-test-3/mom/daughter/granddaughter1=0A=0A$ # Now we= move back the safe "granddaughter1"=0A=0A$ mv /svn-test-3/granddaughter1/ = /svn-test-3/mom/daughter/=0A=0A$ # Now svn recognizes the original "grandda= ughter1"=0A=0A$ svn status /svn-test-3/mom=0A?=A0=A0=A0=A0=A0=A0 /svn-test-= 3/mom/daughter/granddaughter1/bunny3.txt=0AM=A0=A0=A0=A0=A0=A0 /svn-test-3/= mom/daughter/granddaughter1/bunny2.txt=0A=0A$ # NOTE 1: We can "hack" svn i= nto connecting "granddaughter1"=0A=0A$ # NOTE 2: It would be nice to have a= n official way to do this=0A---o---