Hi there, I am getting the following error when I merge a branchline into main line:
SharpSvn.SvnRepositoryIOException: Commit failed (details follow): ---> SharpSvn.SvnRepositoryIOException: At least one property change failed; repository is unchanged ---> SharpSvn.SvnRepositoryIOException:
Could not execute PROPPATCH. ---> SharpSvn.SvnRepositoryIOException: PROPPATCH of '/1d69b349-1243-4ab0-9008-9c44a9209af4/!svn/txr/25-16/trunk': 207 Multi-Status
--- End of inner exception stack trace ---
--- End of inner exception stack trace ---
--- 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\modeler\Mendix.Modeler.Core\VersionControl\SvnConnector.cs:line 825
at Mendix.Modeler.VersionControl.SvnConnector.Commit(String projectDir, SvnCommitArgs commitArgs) in C:\jenkins-ci\workspace\AppStudio3.0-Build\modeler\Mendix.Modeler.Core\VersionControl\SvnConnector.cs:line 777
at Mendix.Modeler.VersionControl.CommitWorker.DoCommit(IProject project, String message, RevisionMetadata metadata) in C:\jenkins-ci\workspace\AppStudio3.0-Build\modeler\Mendix.Modeler.Core\VersionControl\CommitWorker.cs:line 188
at Mendix.Modeler.VersionControl.CommitWorker.CommitToRepositorySilent(IProject project, CommitState state, IProgressInfo info) in C:\jenkins-ci\workspace\AppStudio3.0-Build\modeler\Mendix.Modeler.Core\VersionControl\CommitWorker.cs:line 146
at Mendix.Modeler.UIFramework.Progress.ProcessRunner.RunStep(Step step) in C:\jenkins-ci\workspace\AppStudio3.0-Build\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\modeler\Mendix.Modeler.UIFramework\Progress\ProcessRunner.cs:line 61
at System.ComponentModel.BackgroundWorker.OnDoWork(DoWorkEventArgs e)
at System.ComponentModel.BackgroundWorker.WorkerThreadStart(Object argument) I tried cleaning up my file directory using TurtoiseSVN but this does not work. Same goes for the Resolved option. I also tried merging the other way around (merge Main into my feature branch) but this results in te exact same error. I am using Mendix 7.21 and also tried 7.22 Any ideas on how to solve this issue? Thanks!
↧