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

Re: Issue found: Damaged Repository with rename prior to merge

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Mon, 30 Jun 2008 15:53:45 +0530

Hash: SHA1

Baeriswyl Kuno - Extern (IT-BA-MV) wrote:
> Hello!
> Windows XP
> svn, version 1.5.0 (r31699)
> I've found an issue that damages the repository entirely. Even new a checkout or dump/load works. The damage does happen without any commit.
> 1. Setup repo
> -trunk
> -test1.txt
> -test2.txt
> -branches
> 2. copy trunk to branches/a and commit
> 3. move trunk/test1.txt to trunk/test3.txt and commit
> 4. cd branches/a and update
> 5. merge trunk and commit
> d:\temp\subversion-1.5-repo\checkout\test\branches\a>svn merge svn://localhost/temp/subversion-1.5-repo/test/trunk
> --- Merging r2 through r3 into '.':
> A test3.txt
> D test1.txt
> d:\temp\subversion-1.5-repo\checkout\test\branches\a>svn commit -m ""
> Sending a
> Deleting a\test1.txt
> Adding a\test3.txt
> Committed revision 4.
> 6. merge again
> d:\temp\subversion-1.5-repo\checkout\test\branches\a>svn merge svn://localhost/temp/subversion-1.5-repo/test/trunk
> svn: Working copy path 'test3.txt' does not exist in repository
> After step 6, the repository is entirely damaged without any commit! I haven't found a way to recover my repository yet.

What do you mean by damage? I could still use the repo for other
usecases other than above merge.

I agree I could see the above error. I think it is one of the variants
of issue-3067 which has been fixed in 'trunk of svn' and nominated for
1.5.x for backport.

Unfortunately this particular case is still failing in 'trunk of svn',
will investigate and extend the fix.

Thanks for the nice bug report.
With regards
Kamesh Jayachandran
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-30 12:24:36 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.