Re: corrupted working copy after merge

Hi Paul,

Paul Burba wrote:
> So I could run it with a 1.4.6 client against my trunk server, I
> changed this line the reproduction script:
>
> -svn merge %REPO%/A %WCNAME%\B
> +svn merge %REPO%/A %WCNAME%\B -r1:HEAD
>
> No error with the 1.4.6 client.
>
> So looking a bit further it seems this error was introduced in r27545:
>
> Fix issue #1851: ra_neon/ra_serf do not update the wcprop cache when
> committing a working copy of a URL such as http://hostname (i.e. a URL with
> no path part).
>

I looked into this a bit and this is what I discovered:

* reverting r27545 only makes the error go away, the commit still
   changes A/folder/file2 instead of B/folder/file2;

* the problem is caused by a combination of the merge setting wrong
   version URL wcprops for the files added in B (like
   '/merge/!svn/ver/3/A/folder/file1', notice the A) and the commit of
   the merge failing to reset them to the correct ones (1.4.x does);

* the final commit uses these incorrect version URLs and changes the
   wrong path; the server then sends a new version URL in the DAV MERGE
   response, but r27545 detects that it's for A/folder/file2 not for
   B/folder/file2 and throws an error;

So, two questions:

1. Why is the merge not ignoring the wcprops sent by the server?

2. Why does the 1.5 commit of the merge not restore the wcprops to the
correct values, like 1.4 does?

-- 
Vlad
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org