Failing Commit After Merging Feature Branch Using Replace Method
I am receiving the following error message after using the replace method for merging a feature branch. I was successfully able to run and test the merged branch after replacing all the files except the .svn directory, however trying to commit fails. Any help or suggestions welcomed. SharpSvn.SvnSystemException: Commit failed (details follow): ---> SharpSvn.SvnSystemException: Can't open 'C:\Users\<path to project omitted>\.svn\tmp\svn-38D25B6A': The system cannot find the path specified. --- End of inner exception stack trace --- at SharpSvn.SvnClientArgs.HandleResult(SvnClientContext client, SvnException error, Object targets) at SharpSvn.SvnClient.Commit(ICollection`1 paths, SvnCommitArgs args, SvnCommitResult& result) at Mendix.Modeler.VersionControl.SvnConnector.PathClientDo(String workingCopyPath, Action`1 action) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.Core\VersionControl\SvnConnector.cs:line 903 at Mendix.Modeler.VersionControl.SvnConnector.Commit(String projectDir, SvnCommitArgs commitArgs) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.Core\VersionControl\SvnConnector.cs:line 862 at Mendix.Modeler.VersionControl.CommitWorker.DoCommit(IProject project, String message, RevisionMetadata metadata) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.Core\VersionControl\CommitWorker.cs:line 215 at Mendix.Modeler.VersionControl.CommitWorker.CommitToRepositorySilent(IProject project, CommitState state) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.Core\VersionControl\CommitWorker.cs:line 173 at Mendix.Modeler.VersionControl.RevCommitter.<>c__DisplayClass30_0.<AddCommitStep>b__0(IProgressInfo info) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.Core\VersionControl\RevCommitter.cs:line 277 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.RunStep(Step step) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 81 at Mendix.Modeler.UIFramework.Progress.ProcessRunner.OnDoWork(Object sender, DoWorkEventArgs e) in C:\jenkins-ci\workspace\AppStudio3.0-Build@2\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 61 at System.ComponentModel.BackgroundWorker.OnDoWork(DoWorkEventArgs e) at System.ComponentModel.BackgroundWorker.WorkerThreadStart(Object argument)
For anyone else encountering this error, the stack trace can be misleading.
At first it seems as though SharpSvn cannot find the temporary file noted in the error. However after researching further and a little trial and error, SharpSvn just needed the ‘tmp’ directory to exist so that it could write a temporary file.
Looking through other projects it looks as though there is an inconsistency as to whether this directory exists or not. Creating the ‘.svn/tmp’ directory allowed the forcibly merged project to be committed without error. After checking the ‘/tmp’ directory after the commit there were no files.