Ticket #12937 (closed: self-service)
Problem with SVN commit after merge
|Reported by:||djechelon||Owned by:||nhruby|
|Keywords:||SOG SCM P3 PEND 2012-09-10||Cc:|
I am currently experiencing problems with Subversion for project logbus-ng. I use VisualSVN for Visual Studio, a wrapper plugin for TortoiseSVN (TSVN version 1.6.10)
I maintain two identical copies of directory trunk/logbus-core/It.Unina.Dis.Logbus/ from the repository, the other one is under trunk/logbus-benchmark. The second directory has been created by a previous branch from the first one.
I use to commit the logbus-core's subdirectory, then merge+commit the benchmark's subdirectory.
When I do a merge on the secondary directory to align it to the trunk, VisualSVN proposes me several merging options, including "Working Copy" and "Fully Recursive". If I choose the second option, merge succeeds but the following error occurs during commit:
Adding C:\Users\DJ Echelon\Documents\Visual Studio 2008\Projects\Logbus-benchmark\It.Unina.Dis.Logbus\Configuration\ForwardingConfiguration.cs
Commit failed (details follow):
Server sent unexpected return value (502 Bad Gateway) in response to COPY
request for '/svnroot/logbus-ng/!svn/bc/306/trunk/logbus-core/It.Unina.Dis.Logbus/Configuration/ForwardingConfiguration.cs'
Using merge type "Working copy" reports no error.
As I have managed to understand, at least in the second case, no file upload is performed during commit, instead the files are SVN-copied from the original directory to the merge target.
Anyway, that problem seems to be known by simply searching on Google, and seems related to Apache.
The problem occurs only when I add new files to the main trunk directory.
Thank you for your attention.
Currently, a workaround is to select "Working copy" merge option