Daniel Shahaf wrote:
> C. Michael Pilato wrote on Tue, 4 Nov 2008 at 07:52 -0500:
>> John Szakmeister wrote:
>>> 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.
>>>
>
> Looks good, modulo:
>
> * doc string is over 50 characters
>
> * you can use the new run_and_verify_info() / get_wc_uuid() functions
> instead of parsing stdout_lines yourself.
>
>>> -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.
>>
>
> Good point. If we're paranoid we could modify the test to do a commit and
> double-check the UUIDs after the commit (I've said upthread that the UUIDs
> remain inconsistent even after the foreign-merge-of-add is committed).
r34050,-51.
I went the route of checking the UUID after commit (and using
run_and_verify_info, per your suggestion).
--
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on 2008-11-04 21:35:08 CET