RE: Very slow merge on Windows with SVN 1.5.0

>C:\work\15testing\RB-26.x>svn pl -v .

Can you paste the output of 'svn pl -vR .'

>I assume all of these branches adds a lot of work, and I'd like to
>understand why it recorded all of that when I only merged a single
>branch. That doesn't explain the difference in time between Windows
>and UNIX though.

That single branch(RB-25.x) might have had all those mergeinfo additions in the merge revision range.
And this extra mergeinfo has reached the RB-26.x target via regular prop merge.

> Can you try merge with --ignore-ancestry(Warning: it won't track merges,
> but can be faster, so that we can compare and contrast for the time
> differences)?

>I have already merged other changes since then. But here is a test
>case where nothing needs to be merged (i.e. all changes from RB-25.x
>are already on RB-26.x).

Still you can checkout the RB-26.x as at rev prior to commit of merge and try out the merge to analyse this issue.

>With --ignore-ancestry

>Runs for a while and then spits out a bunch of skipped targets, some
>conflicts and asks me to resolve. I'd send more specifics but I can't
>post the path names to this list.

Try this on a clean working copy(by checking out the relevant past revision(i.e prior to merge+commit).

>Without --ignore-ancestry

>Runs for 14:59.79 and does nothing since no merge is necessary.

Try this on a clean working copy(by checking out the relevant past revision(i.e prior to merge+commit).

>I'd be glad to perform other tests if you want me to.

May be you can attach the errput of svn merge operation after
enabling neon-debug to 130 in '~/.subverion/servers' file on both UNIX and win32.

With regards
Kamesh Jayachandran
Received on 2008-06-26 20:06:10 CEST