[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: John Szakmeister <john_at_szakmeister.net>
Date: Wed, 5 Nov 2008 04:25:43 -0500

On Tue, Nov 4, 2008 at 7:52 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
> John Szakmeister wrote:
>> On Thu, Oct 30, 2008 at 10:14 AM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
>>> 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.
>> I can't see where this happening either. I think I've narrowed it
>> down to a couple of WC functions but it's still unclear to me how it
>> gets there in the first place.
> I know where this happens. See attached patch which, I think, fixes the
> problem.

Sweet. And I see the fix was checked in.

>> I've attached a patch the adds a test to the test_suite. I'd
>> appreciate feedback on it Daniel. If it looks good, we can at least
>> get the test in and figure out how to solve the real problem.
>> -John
>> ======================
>> Add a test for checking the uuid of a file merged from a foreign repository.
>> * subversion/tests/cmdline/merge_tests.py
>> (foreign_repos_uuid): New.
>> (test_list): Add foreign_repos_uuid as XFAIL.
> Thanks for the test. Only problem is that in the *correct* behavior case
> (where the foreign merged add becomes just an add), 'svn info' want show the
> "Repository UUID" line in the output at all. This causes your test to choke.

Doh! I'm actually a little surprised by that. I would have thought
the entries would have been empty for the UUID field as so it would
inherit thisdir's UUID. There must be some logic restricting that
output for added files.

Looks like you tweaked the test and verified it after the fact. Cool,
and glad I could help!


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-05 10:25:59 CET

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.