Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 11:05:56 +01:00
Code Issues Packages Projects Releases Activity

Fix concurrent modification in SVN modify command (#1849)

Browse Source
This commit is contained in:
René Pfeuffer
2021-11-09 14:36:20 +01:00
committed by GitHub
parent cb7dbb0578
commit f680c9335a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnModifyCommand.java
View File

@@ -82,7 +82,7 @@ public class SvnModifyCommand implements ModifyCommand {
private String getCurrentRevision(SVNClientManager clientManager, WorkingCopy<File, File> workingCopy) {
try {
return Integer.toString(clientManager.getStatusClient().doStatus(workingCopy.getWorkingRepository(), false).getRevision().getID());
return Long.toString(clientManager.getStatusClient().doStatus(workingCopy.getWorkingRepository(), false).getRevision().getNumber());
} catch (SVNException e) {
throw new InternalRepositoryException(entity(repository), "Could not read status of working repository", e);
}

2
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnModifyCommandTest.java
View File

@@ -185,7 +185,7 @@ public class SvnModifyCommandTest extends AbstractSvnCommandTestBase {
request.addRequest(new ModifyCommandRequest.CreateFileRequest("Test123", testfile, false));
request.setCommitMessage("this should not pass");
request.setAuthor(new Person("Arthur Dent", "dent@hitchhiker.com"));
request.setExpectedRevision("10");
request.setExpectedRevision("5");
svnModifyCommand.execute(request);