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

BUG? Merging from foreign repository corrupts UUID

From: David Ferguson <ferguson.david_at_gmail.com>
Date: Thu, 30 Oct 2008 10:04:41 -0400

I've found that when merging from a foreign repository, Subversion will
corrupt the UUID of any file being added in the merge.

Here is a short series of commands to create the situation:

# Create the first repository
$ svnadmin create repo1
$ svn co file:///home/dferguso/breakage/repo1 work1

# Add a file to the first repository
$ touch work1/new_file
$ svn add work1/new_file
$ svn ci work1 -m "added a file"

# Create the second repository
$ svnadmin create repo2
$ svn co file:///home/dferguso/breakage/repo2 work2

# Merge change #1 from the first repository to the second
$ svn merge file:///home/dferguso/breakage/repo1 -c1 work2

# Check info. UUID on work2 and work2/new_file don't match!!
$ svn info work1 work2 work2/new_file

Notice that the UUID of work2/new_file is from repository #1 !! It should
match the UUID of its parent directory, work2. This leaves the work2
directory in a bad state. Things like switch and update start complaining
that the UUID of the WC doesn't match the repository.
  svn: The repository at '<full url>' has uuid 'XYZ', but the WC has 'ABC'

The only fix is to recheckout the work directory. Can someone else confirm
that this is a problem? Or is this an already-known issue? (I didn't see
anything in the issue tracker.)

Subversion client is 1.5.3, Linux x86_64, RHEL 4, update 6.

thanks,
David
Received on 2008-10-30 15:05:06 CET

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