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.
> 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.
--
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2008-11-04 13:53:08 CET