Re: corrupted working copy after merge

I was the original reporter of this problem to TortoiseSVN. I just want to
add a point to Stefan's problem summary. Even though the error says "Commit
failed", the repository is updated and, even worse, A/file2 is updated
instead of B/file2.

Stefan Küng wrote:
>
> Hi,
>
> The attached script shows a problem with merging with the 1.5 svn client
> against an 1.5 server. The problem does *not* show with file:/// access
> but with https:// access to an 1.5 repository. I haven't checked http://
> , svn:// and svn+ssh:// though, because I don't have such servers ready
> to test.
>
> Client is svn 1.5.0 (r31699), compiled Jun 20 2008, 22:11:29
> Server is the same version, running Apache 2.0
>
> :: script starts here
> @echo off
> set ROOT=D:/Development/SVN/SVNTests
> set SERVERROOT=N:\repos
> set REPONAME=merge
> set WCNAME=Test6
> set REPO=https://192.168.2.5/svn/merge
> set WC=%ROOT%/%WCNAME%
>
> cd %ROOT%
> if exist %SERVERROOT%\%REPONAME% rd /s /q %SERVERROOT%\%REPONAME%
> if exist %WCNAME% rd /s /q %WCNAME%
>
> mkdir %SERVERROOT%\%REPONAME%
> svnadmin create %SERVERROOT%\%REPONAME%
> :: now we have a new repository on http://192.168.2.5/svn/merge
>
> svn mkdir %REPO%/A -m ""
> svn cp %REPO%/A %REPO%/B -m ""
> svn co %REPO%/A %WCNAME%\A
> svn co %REPO%/B %WCNAME%\B
> mkdir %WCNAME%\A\folder
> echo x > %WCNAME%\A\folder\file1
> echo x > %WCNAME%\A\folder\file2
> echo x > %WCNAME%\A\folder\file3
> svn add %WCNAME%\A\folder
> svn ci %WCNAME%\A -m ""
>
> svn merge %REPO%/A %WCNAME%\B
> svn ci %WCNAME%\B -m ""
> echo y > %WCNAME%\B\folder\file2
> svn ci %WCNAME%\B -m ""
> :: the last commit results in:
> :: Transmitting file data .svn: Commit failed (details follow):
> :: svn: A MERGE response for '/svn/merge/A/folder/file2' is not a child
> of the destination ('/svn/merge/B/folder')
>
>
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
>
>
>

-- 
View this message in context: http://www.nabble.com/corrupted-working-copy-after-merge-tp18407706p18409338.html
Sent from the Subversion Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org