SVN Error When Merging Branches - Svndiff has backwards-sliding source views.
0
Hey Everyone, I’m curious if anyone has thoughts on an error I’m running into when merging branches, SharpSvn.SvnDiffException: Svndiff has backwards-sliding source views. It happens when trying to merge a feature branch back into out Development branch, using an advanced merge. The feature branch was created off the Development branch, and has around 10 commits to it. I’ve tried pulling down a clean copy of the dev branch before merging, but it doesn’t seem to make a difference. Does anyone have any thoughts about how to go about debugging this? Both branches are in 8.17 build 11170. Thanks for any input you might have Here is the full trace SharpSvn.SvnDiffException: Svndiff has backwards-sliding source views at SharpSvn.SvnClientArgs.HandleResult(SvnClientContext client, SvnException error, Object targets) in d:\bb\sharpsvn-v1.900x\v40\src\sharpsvn\svnclientargs.cpp:line 78 at SharpSvn.SvnClient.Merge[TRevisionRange](String targetPath, SvnTarget source, ICollection`1 mergeRange, SvnMergeArgs args) in d:\bb\sharpsvn-v1.900x\v40\src\sharpsvn\commands\merge.cpp:line 127 at Mendix.Modeler.VersionControl.SvnConnector.<>c__DisplayClass43_0.<Merge>b__0(ISvnClient c) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 624 at Mendix.Modeler.VersionControl.SvnConnector.PathClientDo(String workingCopyPath, Action`1 action) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 655 at Mendix.Modeler.VersionControl.SvnConnector.Merge(String projectDir, IRemoteRepository remoteRepository, IRevLine sourceBranchLine, SvnRevisionRange revisionRange, SvnMergeArgs mergeArgs) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.Windows\Svn\SvnConnector.cs:line 625 at Mendix.Modeler.VersionControl.Operations.Svn.SvnMergeOperation.SvnMerge(MergeRequest updateRequest, SvnMergeState svnMergeState, String projectDir) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Operations\Svn\SvnMergeOperation.cs:line 78 at Mendix.Modeler.VersionControl.Operations.Svn.SvnMergeOperation.Execute(MergeRequest updateRequest) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl\Operations\Svn\SvnMergeOperation.cs:line 48