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

Re: BUG? Merging from foreign repository corrupts UUID

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 30 Oct 2008 17:14:39 +0200 (Jerusalem Standard Time)

David Ferguson wrote on Thu, 30 Oct 2008 at 10:47 -0400:
> Daniel,
>
> Thanks for confirming the problem even with the trunk build. I'll post this
> to dev_at_subversion then.
>

If I saw here, the other devs will see it too. :) But in the meantime,
I looked into the code (libsvn_client/merge.c) and couldn't find how the
other repository's UUID is even transferred to the wc layer, so another
eye on this would be appreciated.

>
> Btw, here is an example of a command that fails due to the bad UUID's in the
> working copy:
>

Thanks, I can reproduce it (even without the 'mv').

Daniel

> # Move the repository
> $ mv repo2 repo2_moved
>
> # Run switch to relocate the work2 tree to the moved repository
> $ svn sw --relocate file:///home/dferguso/breakage/repo2
> file:///home/dferguso/breakage/repo2_moved work2
> svn: The repository at 'file:///home/dferguso/breakage/repo2_moved/new_file'
> has uuid 'efa31701-9c4b-4765-be70-c33ec061bfaa', but the WC has
> 'dcc70446-cf29-4897-9959-bc1492de7982'
>
>
>
> On Thu, Oct 30, 2008 at 10:20 AM, Daniel Shahaf <d.s_at_daniel.shahaf.name>wrote:
>
> > David Ferguson wrote on Thu, 30 Oct 2008 at 10:04 -0400:
> > > # 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.
> >
> > Confirmed (up to this point) with trunk:
> >
> > % svn info wc1 wc2 wc1/iota wc2/iota | grep UUID
> > Repository UUID: ce3a91fd-a72c-2141-b64e-ae7bb47ba96e
> > Repository UUID: 87ef63c1-b93b-1d48-a7a0-e56f7abf285d
> > Repository UUID: ce3a91fd-a72c-2141-b64e-ae7bb47ba96e
> > Repository UUID: ce3a91fd-a72c-2141-b64e-ae7bb47ba96e
> >
> > > 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.
> >
> > Can't reproduce this part?
> >
> > % svn ci -m merge
> > Adding iota
> > Transmitting file data .
> > Committed revision 1.
> >
> > % svn up
> > At revision 1.
> >
> > However, even after the commit, the wc is inconsistent:
> >
> > % svn info . iota | grep UUID
> > Repository UUID: 87ef63c1-b93b-1d48-a7a0-e56f7abf285d
> > Repository UUID: ce3a91fd-a72c-2141-b64e-ae7bb47ba96e
> >
> >
> > Daniel
> >
> > > 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
> > >
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-30 16:15:09 CET

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

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