[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: modify-file within an added tree (r1356317) ; possibly rep-cache.db -related

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sun, 8 Jul 2012 16:48:35 +0100

Daniel Shahaf wrote on Sat, Jul 07, 2012 at 15:09:38 +0100:
> Problem: svnsync of /repos/asf r1356317 fails with:
> svnsync: E160013: File not found: revision 1356316, path '/lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr/handler/loader/package-summary.html'
>
> Using 1.7.0, but tnelson reports the same problem (and I suspect he uses
> a more recent version).
>
> Further investigation points to an added-without-copyfrom tree containing a modified file:
>
> [[[
> % svn log -qvr r1356317 https://svn.apache.org/repos/asf/
> ------------------------------------------------------------------------
> r1356317 | rmuir | 2012-07-02 16:13:49 +0000 (Mon, 02 Jul 2012) | 1 line
> Changed paths:
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr/handler
> A /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr/handler/loader
> M /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr/handler/loader/package-summary.html
> .. (some 2000 more additions, all without copyfrom; no changes above api-4_0_0_ALPHA)
> ------------------------------------------------------------------------
...
> How can we have a 'modify-file' within an added-without-copyfrom tree?
> Isn't svnsync correct to complain in this case?

I'd like to resolve the situation on the live svn.a.o repository. I see
a couple of ways to do so:

- Hand-edit the revision file, changing "modify-file" to "add-file "

- Eliminate r1356317 from history: create an svnsync copy of /repos/asf
  using an authz file that excludes /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA
  (or maybe just /lucene/cms/trunk/content/solr/api-4_0_0_ALPHA/org/apache/solr/handler/loader/package-summary.html)
  and have the Lucene PMC recreate that tag later

Thoughts?
Received on 2012-07-08 17:49:15 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.