[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: Tue, 4 Nov 2008 03:23:34 -0500

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.

>> 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').

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.


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.

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-04 09:24:13 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.